Skip to content

Commit 8d34b3e

Browse files
Merge branch 'canary' into update/eagerly-load-bindings
2 parents 404b70e + 72f5c93 commit 8d34b3e

File tree

82 files changed

+1431
-1595
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+1431
-1595
lines changed

.github/workflows/build_test_deploy.yml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -873,6 +873,7 @@ jobs:
873873
- build
874874
- build-wasm
875875
- build-native
876+
- build-native-freebsd
876877
env:
877878
NPM_TOKEN: ${{ secrets.NPM_TOKEN_ELEVATED }}
878879
steps:
@@ -1303,6 +1304,66 @@ jobs:
13031304
name: next-swc-binaries
13041305
path: packages/next-swc/native/next-swc.*.node
13051306

1307+
build-native-freebsd:
1308+
if: ${{ needs.build.outputs.isRelease == 'true' }}
1309+
needs: build
1310+
name: stable - x86_64-unknown-freebsd - node@16
1311+
runs-on: macos-10.15
1312+
steps:
1313+
- name: tune mac network
1314+
run: sudo sysctl -w net.link.generic.system.hwcksum_tx=0 && sudo sysctl -w net.link.generic.system.hwcksum_rx=0
1315+
- uses: actions/checkout@v3
1316+
- name: Delete useless files
1317+
run: |
1318+
rm -rf bench
1319+
rm -rf docs
1320+
rm -rf errors
1321+
rm -rf examples
1322+
rm -rf scripts
1323+
rm -rf test
1324+
- name: Build
1325+
id: build
1326+
uses: vmactions/freebsd-vm@v0.1.6
1327+
env:
1328+
DEBUG: napi:*
1329+
RUSTUP_HOME: /usr/local/rustup
1330+
CARGO_HOME: /usr/local/cargo
1331+
RUSTUP_IO_THREADS: 1
1332+
# Disable LTO, or the lld may crash with OOM
1333+
CARGO_PROFILE_RELEASE_LTO: false
1334+
with:
1335+
envs: DEBUG RUSTUP_HOME CARGO_HOME RUSTUP_IO_THREADS CARGO_PROFILE_RELEASE_LTO NAPI_CLI_VERSION TURBO_VERSION RUST_TOOLCHAIN
1336+
usesh: true
1337+
mem: 6000
1338+
prepare: |
1339+
pkg install -y curl node14
1340+
curl -qL https://www.npmjs.com/install.sh | sh
1341+
npm install -g yarn
1342+
curl https://sh.rustup.rs -sSf --output rustup.sh
1343+
sh rustup.sh -y --profile minimal --default-toolchain stable
1344+
export PATH="/usr/local/cargo/bin:$PATH"
1345+
echo "~~~~ rustc --version ~~~~"
1346+
rustc --version
1347+
echo "~~~~ node -v ~~~~"
1348+
node -v
1349+
run: |
1350+
export PATH="/usr/local/cargo/bin:$PATH"
1351+
pwd
1352+
ls -lah
1353+
whoami
1354+
env
1355+
freebsd-version
1356+
npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" "turbo@${TURBO_VERSION}"
1357+
yarn --cwd packages/next-swc build-native --release --target x86_64-unknown-freebsd
1358+
rm -rf node_modules
1359+
rm -rf packages/next-swc/target
1360+
- name: Upload artifact
1361+
uses: actions/upload-artifact@v3
1362+
with:
1363+
name: next-swc-binaries
1364+
path: packages/next-swc/native/next-swc.*.node
1365+
if-no-files-found: error
1366+
13061367
build-wasm:
13071368
needs: build
13081369
if: ${{ needs.build.outputs.isRelease == 'true' }}

docs/basic-features/pages.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ You can also use **Client-side Rendering** along with Static Generation or Serve
6464
<li><a href="https://github.com/vercel/next.js/tree/canary/examples/cms-graphcms">GraphCMS Example</a> (<a href="https://next-blog-graphcms.vercel.app/">Demo</a>)</li>
6565
<li><a href="https://github.com/vercel/next.js/tree/canary/examples/cms-kontent">Kontent Example</a> (<a href="https://next-blog-kontent.vercel.app/">Demo</a>)</li>
6666
<li><a href="https://github.com/vercel/next.js/tree/canary/examples/cms-builder-io">Builder.io Example</a> (<a href="https://cms-builder-io.vercel.app/">Demo</a>)</li>
67+
<li><a href="https://github.com/vercel/next.js/tree/canary/examples/cms-tina">TinaCMS Example</a> (<a href="https://cms-tina-example.vercel.app/">Demo</a>)</li>
6768
<li><a href="https://static-tweet.vercel.app/">Static Tweet (Demo)</a></li>
6869
</ul>
6970
</details>

errors/swc-disabled.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,16 @@ Many of the integrations with external libraries that currently require custom B
1313
- Emotion
1414

1515
In order to prioritize transforms that will help you adopt SWC please provide your `.babelrc` on [the feedback thread](https://github.com/vercel/next.js/discussions/30174).
16+
17+
#### Possible Ways to Fix It
18+
19+
If you want to use SWC despite the presence of a `.babelrc` file you can force it in your `next.config.js` file.
20+
21+
```js
22+
// next.config.js
23+
module.exports = {
24+
experimental: {
25+
forceSwcTransforms: true,
26+
},
27+
}
28+
```

examples/blog-starter/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ Deploy the example using [Vercel](https://vercel.com?utm_source=github&utm_mediu
3333
- [Kontent](/examples/cms-kontent)
3434
- [Umbraco Heartcore](/examples/cms-umbraco-heartcore)
3535
- [Builder.io](/examples/cms-builder-io)
36+
- [TinaCMS](/examples/cms-tina/)
3637

3738
## How to use
3839

0 commit comments

Comments
 (0)