chore(i18n): sync main into translation/jp - #4729

Draft

thetaPC wants to merge 1763 commits into

translation/jpfrom

chore/merge-main-into-jp

thetaPC commented Sep 11, 2026 •

edited

Loading

Contributor

Merge with a merge commit, not squash

Why

The last preserved merge of main into translation/jp was e7bdaed5d, 2022-07-28. Every sync since has been squashed, so git never recorded them. That is why the MDX migration needed 9 hand-authored PRs on this branch mirroring work already done on main, and why rename detection keeps failing across a four-year diff.

After this lands, the base advances to today and future syncs reconcile weeks instead of years.

Resolution

1,353 conflicts, 1,299 mechanical:

static/usage/ and versioned_docs/ took main, neither is translated
Translated docs/ kept Japanese
docs/ under 20% translated took main
26 paths deleted on both sides, both renamed .md to .mdx independently
sidebars.js kept all 52 Japanese labels, took main's new Upgrade Guides category

Three that needed judgement:

docusaurus.config.js auto-merged into a duplicate VERSIONS_JSON block and would not parse. Fixed.
The component API plugin still required node-fetch, which main has dropped. Kept jp's local-file read, removed the require.
docs/angular/lifecycle.mdx had Japanese text saying components "must not use OnPush", which main has replaced with the opposite guidance. Swapped that one note to English pending translation, since untranslated beats wrong.

Follow-up

27 files keep jp's older <a href> link markup. #4667 needs reapplying to the Japanese tree separately, kept out to avoid mixing a cosmetic sweep into this.

renovate Bot and others added 30 commits

March 30, 2026 11:14


          chore(deps): update dependency vue to v3.5.31 (#4452)

d65ddb5

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency web-vitals to v5.2.0 (#4453)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(react): add utility functions page with useIonRouter docs (#4455)

fa4901b


          docs(react,angular): use ionPage prop for nested outlets and add navi…

fbf2799

…gation playgrounds (#4454)

* docs(react-router): working on v9 migration docs for react router

* docs(react-router): update navigation guide and expand v5-to-v6 migration guide

* chore(lint): running lint

* fix(build): fixing build error

* docs(react-router): fixing several issues

* docs(react-router): converting playground example to rr6

* docs(react-router): updating dependencies, reverting phrasing change

* docs(react): fix nested IonRouterOutlet examples and replace live example

* fix(docs): use playground component for angular navigation

* chore(lint): running lint

* fix(angular): add missing RouterLink import to dashboard component

* refactor: consolidate angular/react navigation playgrounds into single directory

* feat(playground): add default framework setting, migration angular/react navigation live example to use one playground

* fix(playground): allow playground swapping with default framework set

* docs(navigation): combine playground code to one index file

---------

Co-authored-by: Brandy Smith <6577830+brandyscarney@users.noreply.github.com>


          docs(item): add routing section explaining how routerLink works (#4456)

ba23835


          chore(deps): update ionic to v8.8.3 (#4458)

20de9bb


          chore(deps): update angular to v20.3.22 (#4457)

12d2c6d

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency vite to v8.0.4 (#4463)

f5a0b79

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency vite to v8.0.4 (#4462)

0f1bbf9

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency vite-plugin-static-copy to v4.0.1 (#4461)

b36147c

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency vue to v3.5.32 (#4459)

b65802c

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency @types/node to v24.12.2 (#4460)

724240c

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update react to v19.2.5 (#4467)

5a6271a

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency vite to v8.0.5 (#4466)

4afc53e

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency vite to v8.0.5 (#4465)

217b3f7

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency vite to v8.0.5 (#4464)

76c95dd

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(item): document required react version for ionic v9 (#4472)

1eb78c2


          docs(picker-legacy): remove legacy component (#4468)

741f563

Co-authored-by: Brandy Smith <6577830+brandyscarney@users.noreply.github.com>


          chore(deps): update ionic to v8.8.4 (#4473)

2f37cb6

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency vue-tsc to v3.2.7 (#4474)

784db39

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency vite to v8.0.8 (#4471)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency vite to v8.0.8 (#4470)

1851f81

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency vite to v8.0.8 (#4469)

66d84d8

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency vue to v3.5.33 (#4476)

4c99103

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update vite-vue (#4479)

3e0d9fb

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update vite-html (#4478)

d854b10

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency vue-router to v5.0.6 (#4477)

41f95bd

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency vite to v8.0.10 (#4475)

a1721d2

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update ionic to v8.8.5 (#4480)

1ba4b1b

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          docs(usage): update index files to point to v9 usage folder (#4481)

1c612e7

Co-authored-by: Brandy Smith <6577830+brandyscarney@users.noreply.github.com>

thetaPC and others added 16 commits

September 4, 2026 15:02


          chore(v7): rename archived v7 pages and usage partials to .mdx (#4698)

863f4b5


          chore(v6): rename archived v6 pages and usage partials to .mdx (#4699)

5a84385


          chore(v5): rename archived v5 pages to .mdx (#4700)

ca61448


          chore(deps): update dependency @crowdin/cli to v5.0.2 (#4713)

658ad7e

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency @types/react-dom to v19.2.7 (#4711)

b0e335b

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency vitest to v4.1.11 (#4714)

7a0bc48

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency docusaurus-plugin-sass to v0.2.7 (#4712)

072d9a5

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update ionic to v9.0.3 (#4719)

ff6ef40

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency vue-router to v5.3.1 (#4718)

9b4d6d4

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency cspell to v10.2.2 (#4720)

18ec915

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency sass to v1.104.0 (#4721)

81f9966

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(mdx): adopt strict MDX syntax and remove the transitional shims (…

6e355b1

…#4716)


          chore(deps): update dependency cspell to v10.3.0 (#4726)

2240d1b

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency vitest to v5 (#4727)

86d51cb

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(mdx): enable the v4 strict MDX flag and guard admonition syntax (…

84f3b1c

…#4723)


          Merge remote-tracking branch 'origin/main' into chore/merge-main-into-jp

fa41ddc

vercel Bot commented Sep 11, 2026 •

edited

Loading

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated
ionic-docs	Ready	Preview	Sep 12, 2026 3:19am UTC

vercel Bot had a problem deploying to Preview

September 11, 2026 22:43

Failure


          chore(i18n): repair conflict markers and converge markup with main

b307f48

vercel Bot deployed to Preview

September 11, 2026 23:36

View deployment


          chore(i18n): restore translations dropped by the merge resolution

27b7a9a

vercel Bot deployed to Preview

September 12, 2026 02:43

View deployment

thetaPC commented

View reviewed changes

docs/angular/lifecycle.mdx

               :::note
-              `ion-nav` または `ion-router-outlet` を使用するコンポーネントは、 `OnPush` 変更検出方式を使用しないでください。そうすることで、 `ngOnInit` などのライフサイクル・フックが起動するのを防ぐことができます。また、非同期状態の変更は正しくレンダリングされない場合があります。
+              If your pages keep state in plain fields rather than signals, the component hosting `ion-router-outlet` or `ion-tabs` needs eager change detection, as does every component between it and your application root. A change detection pass starts at the application root and skips a clean `OnPush` view along with everything below it, so an `OnPush` component above the outlet stops updates from reaching the routed pages under it. The pages themselves can use `OnPush`, as long as their state is a signal or they call `markForCheck()`.

thetaPC Sep 12, 2026

Contributor Author

JP said components using ion-nav or ion-router-outlet must not use OnPush, and that doing so prevents ngOnInit from firing. Main replaced that in #4694 with the opposite: you can use OnPush on pages, provided state is a signal or you call markForCheck(), plus the Angular 22 default change.


          chore(i18n): add the Babel glossary entry from main

0db1b46

thetaPC commented

View reviewed changes

docs/reference/glossary.mdx


		[Autoprefixer](https://github.com/postcss/autoprefixer)は、手書きのSass/CSSコードにベンダー固有のプレフィックスを追加するツールです。これにより、あなたが書いた標準化されたCSSルールがすべての対応ブラウザで適用されることが保証されます。たとえば、さまざまなブラウザで使用されるすべてのフレックスボックスの構文を覚える代わりに、Autoprefixerを使えば単に<code>display: flex;</code>と書くだけで、自動的に正しいCSSが挿入されます。

		### Babel {/* #babel */}

thetaPC Sep 12, 2026

Contributor Author

New section, not translated

vercel Bot deployed to Preview

September 12, 2026 03:05

View deployment


          chore(i18n): keep nested <b> tags in native troubleshooting

a112b1e

vercel Bot deployed to Preview

September 12, 2026 03:13

View deployment


          chore(i18n): restore v6 translations lost to the versioned_docs rule

232448f

vercel Bot deployed to Preview

September 12, 2026 03:19

View deployment

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet