From 1923248a1ebdae4062a5290d8242fe2e94c0ec04 Mon Sep 17 00:00:00 2001 From: Zack Chapple Date: Mon, 17 Feb 2025 01:28:59 -0500 Subject: [PATCH 1/3] fix(docs): webpack branding states it should be lower case (#7617) * fix(docs): webpack branding states it should be lower case * chore: fix more occurrences --------- Co-authored-by: Strek --- .../06/15/react-labs-what-we-have-been-working-on-june-2022.md | 2 +- src/content/blog/2025/02/14/sunsetting-create-react-app.md | 2 +- src/content/learn/react-compiler.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/content/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022.md b/src/content/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022.md index 80fcb78e6f..1aaa94ec17 100644 --- a/src/content/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022.md +++ b/src/content/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022.md @@ -27,7 +27,7 @@ We announced an [experimental demo of React Server Components](https://legacy.re In particular, we’re abandoning the idea of having forked I/O libraries (eg react-fetch), and instead adopting an async/await model for better compatibility. This doesn’t technically block RSC’s release because you can also use routers for data fetching. Another change is that we’re also moving away from the file extension approach in favor of [annotating boundaries](https://github.com/reactjs/rfcs/pull/189#issuecomment-1116482278). -We’re working together with Vercel and Shopify to unify bundler support for shared semantics in both Webpack and Vite. Before launch, we want to make sure that the semantics of RSCs are the same across the whole React ecosystem. This is the major blocker for reaching stable. +We’re working together with Vercel and Shopify to unify bundler support for shared semantics in both webpack and Vite. Before launch, we want to make sure that the semantics of RSCs are the same across the whole React ecosystem. This is the major blocker for reaching stable. ## Asset Loading {/*asset-loading*/} diff --git a/src/content/blog/2025/02/14/sunsetting-create-react-app.md b/src/content/blog/2025/02/14/sunsetting-create-react-app.md index 531d9c9f69..e61c7ead96 100644 --- a/src/content/blog/2025/02/14/sunsetting-create-react-app.md +++ b/src/content/blog/2025/02/14/sunsetting-create-react-app.md @@ -52,7 +52,7 @@ For existing apps, these guides will help you migrate to a client-only SPA: * [Next.js’ Create React App migration guide](https://nextjs.org/docs/app/building-your-application/upgrading/from-create-react-app) * [React Router’s framework adoption guide](https://reactrouter.com/upgrading/component-routes). -* [Expo Webpack to Expo Router migration guide](https://docs.expo.dev/router/migrate/from-expo-webpack/) +* [Expo webpack to Expo Router migration guide](https://docs.expo.dev/router/migrate/from-expo-webpack/) Create React App will continue working in maintenance mode, and we've published a new version of Create React App to work with React 19. diff --git a/src/content/learn/react-compiler.md b/src/content/learn/react-compiler.md index 0ae4994726..7c46673e7a 100644 --- a/src/content/learn/react-compiler.md +++ b/src/content/learn/react-compiler.md @@ -311,7 +311,7 @@ export default defineConfig({ ### Webpack {/*usage-with-webpack*/} -A community Webpack loader is [now available here](https://github.com/SukkaW/react-compiler-webpack). +A community webpack loader is [now available here](https://github.com/SukkaW/react-compiler-webpack). ### Expo {/*usage-with-expo*/} From 09f39a07a1abacf92f9c92a6e36102ca2c3be2c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erasmo=20Hern=C3=A1ndez?= Date: Mon, 17 Feb 2025 14:26:18 -0300 Subject: [PATCH 2/3] fix: Dashboard component name in blogpost (#7621) --- src/content/blog/2025/02/14/sunsetting-create-react-app.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/blog/2025/02/14/sunsetting-create-react-app.md b/src/content/blog/2025/02/14/sunsetting-create-react-app.md index e61c7ead96..cbc17fdcd9 100644 --- a/src/content/blog/2025/02/14/sunsetting-create-react-app.md +++ b/src/content/blog/2025/02/14/sunsetting-create-react-app.md @@ -110,7 +110,7 @@ export default function App() { return (
{route === 'home' && } - {route === 'dashboard' && } + {route === 'dashboard' && }
) } From d10113d439733cdaaf7f2aa23089ad5718e2f2ad Mon Sep 17 00:00:00 2001 From: Xavi Lee Date: Tue, 18 Feb 2025 16:44:15 +0800 Subject: [PATCH 3/3] fix conflicts --- .../15/react-labs-what-we-have-been-working-on-june-2022.md | 6 +----- src/content/learn/react-compiler.md | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/content/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022.md b/src/content/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022.md index 46a4626638..62a2f8985d 100644 --- a/src/content/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022.md +++ b/src/content/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022.md @@ -27,11 +27,7 @@ description: React 18 经过多年的努力才得以问世，它为 React 团队 特别地，我们放弃了拥有分叉 I/O 库（例如 react-fetch）的想法，转而采用了具有更好兼容性的 async/await 模型。这从技术上讲并不阻碍 RSC 的发布，因为还可以使用路由器进行数据获取。另一个变化是我们也放弃了文件扩展名的方法，而是采用了 [注释边界](https://github.com/reactjs/rfcs/pull/189#issuecomment-1116482278) 的方式。 -<<<<<<< HEAD -我们正在与 Vercel 和 Shopify 合作，在 Webpack 和 Vite 中统一打包器（bundler）对共享语义的支持。在发布之前，我们希望确保整个 React 生态系统中的 RSC 的语义是一致的。这是达到稳定状态的主要障碍。 -======= -We’re working together with Vercel and Shopify to unify bundler support for shared semantics in both webpack and Vite. Before launch, we want to make sure that the semantics of RSCs are the same across the whole React ecosystem. This is the major blocker for reaching stable. ->>>>>>> 09f39a07a1abacf92f9c92a6e36102ca2c3be2c7 +我们正在与 Vercel 和 Shopify 合作，在 webpack 和 Vite 中统一打包器（bundler）对共享语义的支持。在发布之前，我们希望确保整个 React 生态系统中的 RSC 的语义是一致的。这是达到稳定状态的主要障碍。 ## 资源加载 {/*asset-loading*/} diff --git a/src/content/learn/react-compiler.md b/src/content/learn/react-compiler.md index de6d93293c..5c64865130 100644 --- a/src/content/learn/react-compiler.md +++ b/src/content/learn/react-compiler.md @@ -312,11 +312,7 @@ export default defineConfig({ ### Webpack {/*usage-with-webpack*/} -<<<<<<< HEAD -由社区提供的 Webpack loader 可以 [在这里找到](https://github.com/SukkaW/react-compiler-webpack)。 -======= -A community webpack loader is [now available here](https://github.com/SukkaW/react-compiler-webpack). ->>>>>>> 09f39a07a1abacf92f9c92a6e36102ca2c3be2c7 +由社区提供的 webpack loader 可以 [在这里找到](https://github.com/SukkaW/react-compiler-webpack)。 ### Expo {/*usage-with-expo*/}