Skip to content

Commit c835a65

Browse files
lacolacolacolaco
authored
chore: update origin to v21.2.10+sha-42d57c3 (angular#1163)
* chore: update origin to 42d57c3 * fix: migrate untranslated files * fix(migrate): md-class-a src/content/reference/errors * fix(migrate): md-class-b src/content/reference/errors * fix(migrate): md-class-b src/content/tutorials/first-app/steps/01-hello-world * fix(migrate): md-class-b src/content/tools/devtools * fix(migrate): md-class-b src/content/ecosystem * fix(migrate): md-class-b src/content/guide/di * fix(migrate): md-class-b src/content/guide/animations * fix(migrate): md-class-b src/content/guide/aria * fix(migrate): md-class-b src/content/tutorials/signal-forms/steps/6-next-steps * fix(migrate): md-class-c src/content/tutorials/deferrable-views/steps/2-loading-error-placeholder * fix(migrate): md-class-b src/content/guide/components * fix(migrate): md-class-c src/content/events * fix(migrate): md-class-c src/content/ai * fix(migrate): md-class-c src/content/tutorials/deferrable-views/steps/3-defer-triggers * fix(migrate): md-class-b src/content/introduction/essentials * fix(migrate): md-class-b src/content/reference * chore(migrate): defer md-class-d src/content/reference * fix(migrate): md-class-b src/content/tools/cli * chore(migrate): defer md-class-d src/content/tools/cli * fix(migrate): md-class-b src/content/guide/directives * fix(migrate): md-class-c src/content/guide/directives * fix(migrate): md-class-b src/content/introduction * fix(migrate): md-class-c src/content/introduction * fix(migrate): md-class-b src/content/guide/templates * fix(migrate): md-class-c src/content/guide/templates * fix(migrate): md-class-c src/content/guide/forms/signals * chore(migrate): defer md-class-d src/content/guide/forms/signals * fix(migrate): md-class-a src/content/guide/signals * chore(migrate): defer md-class-d src/content/guide/signals * fix(migrate): md-class-a src/content/guide/testing * fix(migrate): md-class-b src/content/guide/testing * fix(migrate): md-class-c src/content/guide/testing * chore(migrate): defer md-class-d src/content/guide/testing * fix(migrate): md-class-b src/content/guide/routing * fix(migrate): md-class-c src/content/guide/routing * chore(migrate): defer md-class-d src/content/guide/routing * fix(migrate): md-class-c src/content/guide/forms * chore(migrate): defer md-class-d src/content/guide/forms * fix(migrate): md-class-c src/content/guide * chore(migrate): defer md-class-d src/content/guide * fix(migrate): src-class-a src/app/features/update * fix(migrate): src-class-c src/app/features/home * fix(migrate): src-class-c src/app/routing/navigation-entries * chore: remove obsolete fix-generate-routes-explicit-id patch Upstream PR 67201 integrated native {#id} support in heading.mts. * fix(docs): resolve textlint errors in zoneless and customizing-route-behavior * fix(migrate): restore guide/security.md hybrid (preserve translation, insert new sections in English) * fix(migrate): restore guide/routing/navigate-to-routes.md hybrid * fix(migrate): restore guide/signals/resource.md hybrid * fix(migrate): restore guide/forms/form-validation.md hybrid * fix(migrate): restore guide/forms/reactive-forms.md hybrid The 8 removals were English-only stylistic rewordings; effective change is purely additive (NOTE about zoneless + HELPFUL link). * fix(migrate): restore guide/forms/signals/field-state-management.md partial hybrid Tracking values for array fields: pure addition (English). Form submission / reset: existing-section API rewrite (FormRoot directive); replaced JP body with new English. * fix(docs): apply textlint --fix to field-state-management * fix(migrate): restore guide/routing/define-routes.md hybrid Removed Japanese translation of the relocated 'Route Loading Strategies' section (moved to loading-strategies.md upstream); preserved remaining translation. * fix(migrate): restore tools/cli/build.md hybrid Builder name rename, table cell expansions, and new lazy-loaded bundle section all translated inline. * fix(migrate): mirror item.key->item.value prose fix in NG0955.md * fix(migrate): mirror lodash isEqual import in signals/overview.md code block * fix(migrate): apply leading-slash link path updates in binding.md * fix(migrate): apply NgTemplateOutlet typo fix and DI link in ng-container.md * fix(migrate): apply patchValue case fix in reactive-forms.md * fix(migrate): realign styling.md bullet structure with upstream * fix(migrate): apply roadmap special-case migration Replace structural defer with hybrid: preserve previously translated docs-cards moved into Completed projects (Signal debugging in DevTools, Improve HMR, Zoneless Angular). Insert new English sections (AI experience, Compiler, Reactivity, Components, etc.) for follow-up translation. Remove deleted Future work section. Resolve textlint conjunction/joshi issues in restored Japanese text. * fix(docs): preserve TIP/IMPORTANT annotation prefixes in English Special-prefix annotations (IMPORTANT:, TIP:, etc.) at line start are recognized as docs callouts by the adev build pipeline. Restore the uppercase English prefix in two files where the annotation had been translated: - making-requests.md: Tip: -> TIP: - 6-next-steps/README.md: 重要: -> IMPORTANT: * fix(migrate): mirror inject() refactor in hierarchical-dependency-injection.md The Self example code block was updated upstream to use inject() with the {self: true} option instead of @self() constructor injection. Mirror the same change to the JA-side .md so the fenced code blocks stay in sync. * fix(migrate): correct structural alignment exposed by new verifier Fixes surfaced by the new verify-migration.ts structural-marker check (code-fence / heading / line-prefix-annotation positions must match between .en.md and .md): - directives/attribute-directives.md: remove stray blank line that shifted the next heading +1; add trailing newline. - directives/overview.md: same shape — extra blank line before the '## Hosting a directive...' heading; add trailing newline. - image-optimization.md L219: revert spurious 'NOTE:' annotation prefix on a JA line whose EN counterpart is plain prose ('Note that ...') — the JA was rendering an extra docs callout absent from upstream.
1 parent 25d0e42 commit c835a65

160 files changed

Lines changed: 3295 additions & 1220 deletions

File tree

Some content is hidden

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

‎adev-ja/src/app/features/home/home.component.en.html‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,35 +50,35 @@ <h2 id="features">Features that actually <br />help you solve problems</h2>
5050

5151
<div class="sliding-window">
5252
<div ngTabPanel [preserveContent]="true" value="signals">
53-
@defer (on idle) {
54-
<ng-template ngTabContent>
53+
<ng-template ngTabContent>
54+
@defer (on idle) {
5555
<adev-signals-demo />
56-
</ng-template>
57-
}
56+
}
57+
</ng-template>
5858
</div>
5959

6060
<div ngTabPanel [preserveContent]="true" value="control-flow">
61-
@defer (on idle) {
62-
<ng-template ngTabContent>
61+
<ng-template ngTabContent>
62+
@defer (on idle) {
6363
<adev-control-flow-example />
64-
</ng-template>
65-
}
64+
}
65+
</ng-template>
6666
</div>
6767

6868
<div ngTabPanel [preserveContent]="true" value="deferrable-views">
69-
@defer (on idle) {
70-
<ng-template ngTabContent>
69+
<ng-template ngTabContent>
70+
@defer {
7171
<adev-defer-example />
72-
</ng-template>
73-
}
72+
}
73+
</ng-template>
7474
</div>
7575

7676
<div ngTabPanel [preserveContent]="true" value="hydration">
77-
@defer (on idle) {
78-
<ng-template ngTabContent>
77+
<ng-template ngTabContent>
78+
@defer {
7979
<adev-hydration-example />
80-
</ng-template>
81-
}
80+
}
81+
</ng-template>
8282
</div>
8383
</div>
8484
</div>
@@ -160,7 +160,7 @@ <h3>
160160

161161
<section class="explore-section" id="learn-more">
162162
<div class="title">
163-
<h2>What to learn more about Angular?</h2>
163+
<h2>Want to learn more about Angular?</h2>
164164
<div class="pattern"></div>
165165
</div>
166166

‎adev-ja/src/app/features/home/home.component.html‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,35 +50,35 @@ <h2 id="features">あなたの問題解決を助ける<br />多くの機能</h2>
5050

5151
<div class="sliding-window">
5252
<div ngTabPanel [preserveContent]="true" value="signals">
53-
@defer (on idle) {
54-
<ng-template ngTabContent>
53+
<ng-template ngTabContent>
54+
@defer (on idle) {
5555
<adev-signals-demo />
56-
</ng-template>
57-
}
56+
}
57+
</ng-template>
5858
</div>
5959

6060
<div ngTabPanel [preserveContent]="true" value="control-flow">
61-
@defer (on idle) {
62-
<ng-template ngTabContent>
61+
<ng-template ngTabContent>
62+
@defer (on idle) {
6363
<adev-control-flow-example />
64-
</ng-template>
65-
}
64+
}
65+
</ng-template>
6666
</div>
6767

6868
<div ngTabPanel [preserveContent]="true" value="deferrable-views">
69-
@defer (on idle) {
70-
<ng-template ngTabContent>
69+
<ng-template ngTabContent>
70+
@defer {
7171
<adev-defer-example />
72-
</ng-template>
73-
}
72+
}
73+
</ng-template>
7474
</div>
7575

7676
<div ngTabPanel [preserveContent]="true" value="hydration">
77-
@defer (on idle) {
78-
<ng-template ngTabContent>
77+
<ng-template ngTabContent>
78+
@defer {
7979
<adev-hydration-example />
80-
</ng-template>
81-
}
80+
}
81+
</ng-template>
8282
</div>
8383
</div>
8484
</div>
@@ -160,7 +160,7 @@ <h3>
160160

161161
<section class="explore-section" id="learn-more">
162162
<div class="title">
163-
<h2>Angularの何を学ぶ？</h2>
163+
<h2>Angularについてもっと学びたいですか？</h2>
164164
<div class="pattern"></div>
165165
</div>
166166

‎adev-ja/src/app/features/update/recommendations.en.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2703,6 +2703,14 @@ export const RECOMMENDATIONS: Step[] = [
27032703
action:
27042704
"Upgrade your project's TypeScript version to at least 5.8 before upgrading to Angular v20 to ensure compatibility.",
27052705
},
2706+
{
2707+
possibleIn: 2000,
2708+
necessaryAsOf: 2000,
2709+
level: ApplicationComplexity.Medium,
2710+
step: '20.0.0_set_moduleResolution_to_bundler',
2711+
action:
2712+
"Set `moduleResolution` to `'bundler'` in your `tsconfig.json`. Angular CLI's `ng update` migration applies this change automatically; if you upgrade manually or override the option in a base tsconfig, set it explicitly so imports of secondary entry-points such as `@angular/core/rxjs-interop` continue to resolve correctly.",
2713+
},
27062714
{
27072715
possibleIn: 2000,
27082716
necessaryAsOf: 2000,

‎adev-ja/src/app/features/update/recommendations.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2703,6 +2703,14 @@ export const RECOMMENDATIONS: Step[] = [
27032703
action:
27042704
'互換性を確保するために、Angular v20に更新する前にプロジェクトのTypeScriptバージョンを少なくとも5.8に更新してください。',
27052705
},
2706+
{
2707+
possibleIn: 2000,
2708+
necessaryAsOf: 2000,
2709+
level: ApplicationComplexity.Medium,
2710+
step: '20.0.0_set_moduleResolution_to_bundler',
2711+
action:
2712+
'`tsconfig.json`の`moduleResolution`を`\'bundler\'`に設定してください。Angular CLIの`ng update`マイグレーションはこの変更を自動的に適用します。手動でアップグレードする場合やベースtsconfig内でオプションをオーバーライドする場合は、`@angular/core/rxjs-interop`のようなセカンダリエントリーポイントのインポートが引き続き正しく解決されるよう、明示的に設定してください。',
2713+
},
27062714
{
27072715
possibleIn: 2000,
27082716
necessaryAsOf: 2000,

‎adev-ja/src/app/features/update/update.component.en.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="page docs-viewer">
1+
<main class="page docs-viewer">
22
<h1 class="page-header" tabindex="-1">Update Guide</h1>
33
<div class="wizard">
44
<div>
@@ -205,4 +205,4 @@ <h3>After you update</h3>
205205
}
206206
</div>
207207
}
208-
</div>
208+
</main>

‎adev-ja/src/app/features/update/update.component.en.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export default class UpdateComponent {
108108
];
109109
protected from = this.versions.find((version) => version.name === '20.0')!;
110110
protected to = this.versions.find((version) => version.name === '21.0')!;
111-
protected futureVersion = 2100;
111+
protected futureVersion = 2200;
112112

113113
protected readonly steps: Step[] = RECOMMENDATIONS;
114114

‎adev-ja/src/app/features/update/update.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="page docs-viewer">
1+
<main class="page docs-viewer">
22
<h1 class="page-header" tabindex="-1">アップデートガイド</h1>
33
<div class="wizard">
44
<div>
@@ -205,4 +205,4 @@ <h3>アップデート後</h3>
205205
}
206206
</div>
207207
}
208-
</div>
208+
</main>

‎adev-ja/src/app/features/update/update.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export default class UpdateComponent {
108108
];
109109
protected from = this.versions.find((version) => version.name === '20.0')!;
110110
protected to = this.versions.find((version) => version.name === '21.0')!;
111-
protected futureVersion = 2100;
111+
protected futureVersion = 2200;
112112

113113
protected readonly steps: Step[] = RECOMMENDATIONS;
114114

‎adev-ja/src/app/routing/navigation-entries/index.en.ts‎

Lines changed: 48 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,11 @@ export const DOCS_SUB_NAVIGATION_DATA: NavigationItem[] = [
363363
path: 'guide/routing/define-routes',
364364
contentPath: 'guide/routing/define-routes',
365365
},
366+
{
367+
label: 'Route Loading Strategies',
368+
path: 'guide/routing/loading-strategies',
369+
contentPath: 'guide/routing/loading-strategies',
370+
},
366371
{
367372
label: 'Show routes with Outlets',
368373
path: 'guide/routing/show-routes-with-outlets',
@@ -491,6 +496,27 @@ export const DOCS_SUB_NAVIGATION_DATA: NavigationItem[] = [
491496
category: 'Signal Forms',
492497
status: 'new',
493498
},
499+
{
500+
label: 'Cross-field logic',
501+
path: 'guide/forms/signals/cross-field-logic',
502+
contentPath: 'guide/forms/signals/cross-field-logic',
503+
category: 'Signal Forms',
504+
status: 'new',
505+
},
506+
{
507+
label: 'Form submission',
508+
path: 'guide/forms/signals/form-submission',
509+
contentPath: 'guide/forms/signals/form-submission',
510+
category: 'Signal Forms',
511+
status: 'new',
512+
},
513+
{
514+
label: 'Schemas',
515+
path: 'guide/forms/signals/schemas',
516+
contentPath: 'guide/forms/signals/schemas',
517+
category: 'Signal Forms',
518+
status: 'new',
519+
},
494520
{
495521
label: 'Async operations',
496522
path: 'guide/forms/signals/async-operations',
@@ -655,6 +681,7 @@ export const DOCS_SUB_NAVIGATION_DATA: NavigationItem[] = [
655681
path: 'guide/routing/testing',
656682
contentPath: 'guide/routing/testing',
657683
status: 'new',
684+
isCrossReferenced: true,
658685
},
659686
{
660687
label: 'Debugging tests',
@@ -858,6 +885,7 @@ export const DOCS_SUB_NAVIGATION_DATA: NavigationItem[] = [
858885
label: 'Route transition animations',
859886
path: 'guide/routing/route-transition-animations',
860887
contentPath: 'guide/routing/route-transition-animations',
888+
isCrossReferenced: true,
861889
},
862890
],
863891
},
@@ -870,7 +898,6 @@ export const DOCS_SUB_NAVIGATION_DATA: NavigationItem[] = [
870898
},
871899
{
872900
label: 'Build with AI',
873-
status: 'new',
874901
children: [
875902
{
876903
label: 'Get Started',
@@ -883,9 +910,10 @@ export const DOCS_SUB_NAVIGATION_DATA: NavigationItem[] = [
883910
contentPath: 'ai/develop-with-ai',
884911
},
885912
{
886-
label: 'Design Patterns',
887-
path: 'ai/design-patterns',
888-
contentPath: 'ai/design-patterns',
913+
label: 'Agent Skills',
914+
path: 'ai/agent-skills',
915+
contentPath: 'ai/agent-skills',
916+
status: 'new',
889917
},
890918
{
891919
label: 'Angular CLI MCP Server setup',
@@ -897,6 +925,11 @@ export const DOCS_SUB_NAVIGATION_DATA: NavigationItem[] = [
897925
path: 'ai/ai-tutor',
898926
contentPath: 'ai/ai-tutor',
899927
},
928+
{
929+
label: 'Design Patterns',
930+
path: 'ai/design-patterns',
931+
contentPath: 'ai/design-patterns',
932+
},
900933
],
901934
},
902935
{
@@ -1032,16 +1065,15 @@ export const DOCS_SUB_NAVIGATION_DATA: NavigationItem[] = [
10321065
},
10331066
// TODO: create those guides
10341067
// The signal debugging docs should also be added to the signal section
1035-
// {
10361068
// label: 'Signals',
10371069
// path: 'tools/devtools/signals',
10381070
// contentPath: 'tools/devtools/signals',
10391071
// },
1040-
// {
1041-
// label: 'Router',
1042-
// path: 'tools/devtools/router',
1043-
// contentPath: 'tools/devtools/router',
1044-
// }
1072+
{
1073+
label: 'Router Tree',
1074+
path: 'tools/devtools/router',
1075+
contentPath: 'tools/devtools/router',
1076+
},
10451077
],
10461078
},
10471079
{
@@ -1086,6 +1118,12 @@ export const DOCS_SUB_NAVIGATION_DATA: NavigationItem[] = [
10861118
},
10871119

10881120
// Loading Performance
1121+
{
1122+
label: 'Lazy-loaded routes',
1123+
path: 'best-practices/performance/lazy-loaded-routes',
1124+
contentPath: 'guide/routing/loading-strategies',
1125+
category: 'Loading Performance',
1126+
},
10891127
{
10901128
label: 'Deferred loading with @defer',
10911129
path: 'best-practices/performance/defer',

0 commit comments

Comments
 (0)