From 3246989c210dc5d4239b0638b2418572ba123ad4 Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Tue, 12 Nov 2024 15:35:32 +0100 Subject: [PATCH 1/2] Compiler: Update link to Expo documentation (#7288) --- src/content/learn/react-compiler.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/learn/react-compiler.md b/src/content/learn/react-compiler.md index df46954d27..4c3d6f8fb0 100644 --- a/src/content/learn/react-compiler.md +++ b/src/content/learn/react-compiler.md @@ -315,7 +315,7 @@ A community Webpack loader is [now available here](https://github.com/SukkaW/rea ### Expo {/*usage-with-expo*/} -Please refer to [Expo's docs](https://docs.expo.dev/preview/react-compiler/) to enable and use the React Compiler in Expo apps. +Please refer to [Expo's docs](https://docs.expo.dev/guides/react-compiler/) to enable and use the React Compiler in Expo apps. ### Metro (React Native) {/*usage-with-react-native-metro*/} From 84b0b2fc70d2e4489bc0519988078a86e7d2ae51 Mon Sep 17 00:00:00 2001 From: Xleine Date: Wed, 13 Nov 2024 18:29:22 +0800 Subject: [PATCH 2/2] fix conflict --- src/content/learn/react-compiler.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/content/learn/react-compiler.md b/src/content/learn/react-compiler.md index a02249b262..c4e5ec23e2 100644 --- a/src/content/learn/react-compiler.md +++ b/src/content/learn/react-compiler.md @@ -316,11 +316,7 @@ export default defineConfig({ ### Expo {/*usage-with-expo*/} -<<<<<<< HEAD -请参考 [Expo 文档](https://docs.expo.dev/preview/react-compiler/) 应用程序中启用和使用 React Compiler。 -======= -Please refer to [Expo's docs](https://docs.expo.dev/guides/react-compiler/) to enable and use the React Compiler in Expo apps. ->>>>>>> 3246989c210dc5d4239b0638b2418572ba123ad4 +请参考 [Expo 文档](https://docs.expo.dev/guides/react-compiler/) 应用程序中启用和使用 React Compiler。 ### Metro (React Native) {/*usage-with-react-native-metro*/}