Skip to content

Commit

Permalink
Merge branch 'canary' into update-with-fauna-example
Browse files Browse the repository at this point in the history
  • Loading branch information
artem-kurnikov authored Aug 4, 2021
2 parents a71e90c + d368f76 commit e60d32f
Show file tree
Hide file tree
Showing 79 changed files with 2,421 additions and 114 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ packages/next-env/**/*.d.ts
packages/create-next-app/templates/**
test/integration/eslint/**
test-timings.json
packages/next/build/swc/tests/fixture/**
29 changes: 22 additions & 7 deletions .github/workflows/build_native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
with:
profile: minimal
override: true
toolchain: stable
toolchain: nightly-2021-03-25
target: aarch64-apple-darwin

- name: Install dependencies
Expand All @@ -111,29 +111,44 @@ jobs:

steps:
- uses: actions/checkout@v2
if: ${{ env.GITHUB_EVENT_NAME == 'workflow_dispatch' }}
if: ${{ github.event_name == 'workflow_dispatch' }}
- uses: actions/download-artifact@v2
with:
name: next-swc-binaries
path: packages/next/native
if: ${{ env.GITHUB_EVENT_NAME == 'workflow_dispatch' }}
if: ${{ github.event_name == 'workflow_dispatch' }}
- uses: EndBug/add-and-commit@v7
with:
add: 'packages/next/native --force'
message: 'Build next-swc binaries'
if: ${{ env.GITHUB_EVENT_NAME == 'workflow_dispatch' }}
if: ${{ github.event_name == 'workflow_dispatch' }}

check:
needs: [build, build-apple-silicon]
runs-on: ubuntu-18.04

steps:
- uses: actions/checkout@v2
if: ${{ env.GITHUB_EVENT_NAME == 'pull_request' }}
if: ${{ github.event_name == 'pull_request' }}
- uses: actions/download-artifact@v2
with:
name: next-swc-binaries
path: packages/next/native
if: ${{ env.GITHUB_EVENT_NAME == 'pull_request' }}
if: ${{ github.event_name == 'pull_request' }}
- run: git diff --exit-code
if: ${{ env.GITHUB_EVENT_NAME == 'pull_request' }}
if: ${{ github.event_name == 'pull_request' }}

test:
runs-on: ubuntu-18.04

steps:
- uses: actions/checkout@v2
if: ${{ github.event_name == 'pull_request' }}
- name: Install
if: ${{ github.event_name == 'pull_request' }}
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2021-03-25
profile: minimal
- run: cd packages/next/build/swc && cargo test
if: ${{ github.event_name == 'pull_request' }}
2 changes: 2 additions & 0 deletions docs/api-reference/next/head.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,5 @@ In this case only the second `<meta property="og:title" />` is rendered. `meta`
`title`, `meta` or any other elements (e.g. `script`) need to be contained as **direct** children of the `Head` element,
or wrapped into maximum one level of `<React.Fragment>` or arrays—otherwise the tags won't be correctly picked up on client-side navigations.

> We recommend using [next/script](/docs/basic-features/script.md) in your component instead of manually creating a `<script>` in `next/head`.
4 changes: 4 additions & 0 deletions packages/next/build/swc/.cargo/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[build]
rustflags = [
"--cfg", "procmacro2_semver_exempt",
]
3 changes: 3 additions & 0 deletions packages/next/build/swc/.rustfmt.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
format_strings = true
use_field_init_shorthand = true
wrap_comments = true
Loading

0 comments on commit e60d32f

Please sign in to comment.