diff --git a/public/images/tutorial/codesandbox-devtools.png b/public/images/tutorial/codesandbox-devtools.png
deleted file mode 100644
index 1f7ebd500..000000000
Binary files a/public/images/tutorial/codesandbox-devtools.png and /dev/null differ
diff --git a/public/images/tutorial/components-tab.png b/public/images/tutorial/components-tab.png
new file mode 100644
index 000000000..90ce0770e
Binary files /dev/null and b/public/images/tutorial/components-tab.png differ
diff --git a/public/images/tutorial/devtools-inspect.gif b/public/images/tutorial/devtools-inspect.gif
new file mode 100644
index 000000000..5c623e6a7
Binary files /dev/null and b/public/images/tutorial/devtools-inspect.gif differ
diff --git a/public/images/tutorial/devtools-select.gif b/public/images/tutorial/devtools-select.gif
deleted file mode 100644
index dd1e1aa61..000000000
Binary files a/public/images/tutorial/devtools-select.gif and /dev/null differ
diff --git a/public/images/tutorial/sandbox-new-tab.png b/public/images/tutorial/sandbox-new-tab.png
new file mode 100644
index 000000000..093a363fb
Binary files /dev/null and b/public/images/tutorial/sandbox-new-tab.png differ
diff --git a/src/components/ButtonLink.tsx b/src/components/ButtonLink.tsx
index bd98d5b38..dff09ed3a 100644
--- a/src/components/ButtonLink.tsx
+++ b/src/components/ButtonLink.tsx
@@ -33,7 +33,7 @@ function ButtonLink({
className,
'active:scale-[.98] transition-transform inline-flex font-bold items-center outline-none focus:outline-none focus-visible:outline focus-visible:outline-link focus:outline-offset-2 focus-visible:dark:focus:outline-link-dark leading-snug',
{
- 'bg-link text-white dark:bg-brand-dark dark:text-secondary hover:bg-opacity-80':
+ 'bg-link text-white dark:bg-brand-dark dark:text-gray-90 hover:bg-opacity-80':
type === 'primary',
'text-primary dark:text-primary-dark shadow-secondary-button-stroke dark:shadow-secondary-button-stroke-dark hover:bg-gray-40/5 active:bg-gray-40/10 hover:dark:bg-gray-60/5 active:dark:bg-gray-60/10':
type === 'secondary',
diff --git a/src/content/community/conferences.md b/src/content/community/conferences.md
index 7adbb4035..3dd5eba45 100644
--- a/src/content/community/conferences.md
+++ b/src/content/community/conferences.md
@@ -25,6 +25,11 @@ September 10-11, 2026. In-person in Zurich, Switzerland
[Website](https://conf.zurichjs.com?utm_campaign=ZurichJS_Conf&utm_source=referral&utm_content=reactjs_community_conferences) - [Twitter](https://x.com/zurichjs) - [LinkedIn](https://www.linkedin.com/company/zurichjs/)
+### React Conf Japan 2027 {/*react-conf-japan-2027*/}
+April 24, 2027. In-person in Tokyo, Japan
+
+[Website](https://reactconf.jp/) - [Twitter](https://x.com/reactconfjp)
+
## Past Conferences {/*past-conferences*/}
### CityJS New Delhi 2026 {/*cityjs-newdelhi-2026*/}
diff --git a/src/content/learn/react-compiler/installation.md b/src/content/learn/react-compiler/installation.md
index c99240fae..9bbcfeadd 100644
--- a/src/content/learn/react-compiler/installation.md
+++ b/src/content/learn/react-compiler/installation.md
@@ -64,9 +64,36 @@ module.exports = {
### Vite {/*vite*/}
+<<<<<<< HEAD
Vite を使用している場合は、プラグインを vite-plugin-react に追加できます。
+=======
+If you use Vite with version 6.0.0 or later of `@vitejs/plugin-react`, you can use the `reactCompilerPreset`:
+>>>>>>> 2639f369946f763fff9a2572b0d7c4b9e2f83ebd
-```js {3,9}
+
+npm install -D @rolldown/plugin-babel
+
+
+```js {3-4,9-11}
+// vite.config.js
+import { defineConfig } from 'vite';
+import react, { reactCompilerPreset } from '@vitejs/plugin-react';
+import babel from '@rolldown/plugin-babel';
+
+export default defineConfig({
+ plugins: [
+ react(),
+ babel({
+ presets: [reactCompilerPreset()]
+ }),
+ ],
+});
+```
+
+
+In `@vitejs/plugin-react@6.0.0`, the inline Babel option was removed. If you're using an older version, you can use:
+
+```js
// vite.config.js
import { defineConfig } from 'vite';
import react from '@vitejs/plugin-react';
@@ -81,26 +108,25 @@ export default defineConfig({
],
});
```
+
+<<<<<<< HEAD
または、Vite 用の Babel プラグインを別に使用したい場合は以下のようにします。
+=======
+Alternatively, you can use the Babel plugin directly with `@rolldown/plugin-babel`:
+>>>>>>> 2639f369946f763fff9a2572b0d7c4b9e2f83ebd
-
-npm install -D vite-plugin-babel
-
-
-```js {2,11}
+```js {3,9}
// vite.config.js
-import babel from 'vite-plugin-babel';
import { defineConfig } from 'vite';
import react from '@vitejs/plugin-react';
+import babel from '@rolldown/plugin-babel';
export default defineConfig({
plugins: [
react(),
babel({
- babelConfig: {
- plugins: ['babel-plugin-react-compiler'],
- },
+ plugins: ['babel-plugin-react-compiler'],
}),
],
});
diff --git a/src/content/learn/tutorial-tic-tac-toe.md b/src/content/learn/tutorial-tic-tac-toe.md
index a33c43b14..f53f234d4 100644
--- a/src/content/learn/tutorial-tic-tac-toe.md
+++ b/src/content/learn/tutorial-tic-tac-toe.md
@@ -899,6 +899,7 @@ body {
### React Developer Tools {/*react-developer-tools*/}
+<<<<<<< HEAD
React DevTools を使うと、React コンポーネントの props や state を確認することができます。React DevTools タブは、CodeSandbox の *Browser* セクションの下部にあります。

@@ -906,12 +907,26 @@ React DevTools を使うと、React コンポーネントの props や state を
画面上の特定のコンポーネントについて調べるには、React DevTools の左上にあるボタンを使用します。

+=======
+React Developer Tools let you check the props and the state of your React components. It is available as a [Chrome](https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi?hl=en), [Firefox](https://addons.mozilla.org/en-US/firefox/addon/react-devtools/), and [Edge](https://microsoftedge.microsoft.com/addons/detail/react-developer-tools/gpphkfbcpidddadnkolkpfckpihlkkil) browser extension.
-
+After you install it, a new *Components* tab will appear in your browser Developer Tools for sites using React. If you're following along in CodeSandbox, you'd need to first open your sandbox preview in a new tab:
+
+
+
+Then, on the preview page, open your browser's DevTools and find the *Components* tab:
+>>>>>>> 2639f369946f763fff9a2572b0d7c4b9e2f83ebd
+
+
+<<<<<<< HEAD
ローカル開発をしている場合、React DevTools は [Chrome](https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi?hl=en)、[Firefox](https://addons.mozilla.org/en-US/firefox/addon/react-devtools/)、そして [Edge](https://microsoftedge.microsoft.com/addons/detail/react-developer-tools/gpphkfbcpidddadnkolkpfckpihlkkil) ブラウザの拡張機能として利用できます。インストールすると、React を利用しているサイトでは *Components* タブがブラウザの開発者ツールに表示されるようになります。
+=======
+To inspect a particular component on the screen, use the button in the top left corner of the Components tab:
+
+
+>>>>>>> 2639f369946f763fff9a2572b0d7c4b9e2f83ebd
-
## ゲームを完成させる {/*completing-the-game*/}
diff --git a/src/content/reference/react-dom/components/form.md b/src/content/reference/react-dom/components/form.md
index 1e0a85245..f294fb251 100644
--- a/src/content/reference/react-dom/components/form.md
+++ b/src/content/reference/react-dom/components/form.md
@@ -48,9 +48,53 @@ title: "