Skip to content

Commit e68fbf5

Browse files
lacolacolacolaco
committed
fix: update git patches for origin 21.0.0
- Regenerate add-global-styles.patch with em element style and new file structure - Update change-document-title.patch for new index.html structure (removed meta name="title") - Update replace-canonical-host.patch for new line numbers and additional URL references - Update replace-environment-values.patch for angular_next_dev index name - Update translate-top-level-banner.patch for 2025 survey
1 parent 21e1cac commit e68fbf5

File tree

5 files changed

+67
-33
lines changed

5 files changed

+67
-33
lines changed

‎tools/adev-patches/add-global-styles.patch‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/adev/shared-docs/styles/_typography.scss b/adev/shared-docs/styles/_typography.scss
2-
index 1c4e2ce0e7..8e897e21f9 100644
2+
index 241b9050eb..10cb1e918b 100644
33
--- a/adev/shared-docs/styles/_typography.scss
44
+++ b/adev/shared-docs/styles/_typography.scss
5-
@@ -110,4 +110,10 @@
5+
@@ -109,4 +109,10 @@
66
margin-block: 1rem;
77
transition: border-color 0.3s ease;
88
}
@@ -14,13 +14,13 @@ index 1c4e2ce0e7..8e897e21f9 100644
1414
+ }
1515
}
1616
diff --git a/adev/src/local-styles.scss b/adev/src/local-styles.scss
17-
index 2c83a2ad4a..ef2da20372 100644
17+
index 926fe7ec11..78c44f1f43 100644
1818
--- a/adev/src/local-styles.scss
1919
+++ b/adev/src/local-styles.scss
20-
@@ -1,3 +1,21 @@
21-
@use './styles/xterm';
22-
23-
@include xterm.xterm();
20+
@@ -7,3 +7,21 @@
21+
@tailwind base;
22+
@tailwind components;
23+
@tailwind utilities;
2424
+
2525
+// adev-ja overrides
2626
+

‎tools/adev-patches/change-document-title.patch‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/adev/src/app/core/services/a-dev-title-strategy.ts b/adev/src/app/core/services/a-dev-title-strategy.ts
2-
index 75a1daa0e9..6acf3ec62f 100644
2+
index d023d95b94..31d1549da8 100644
33
--- a/adev/src/app/core/services/a-dev-title-strategy.ts
44
+++ b/adev/src/app/core/services/a-dev-title-strategy.ts
55
@@ -13,7 +13,7 @@ import {ActivatedRouteSnapshot, RouterStateSnapshot, TitleStrategy} from '@angul
@@ -12,7 +12,7 @@ index 75a1daa0e9..6acf3ec62f 100644
1212
export const DEFAULT_PAGE_TITLE = 'Overview';
1313

1414
diff --git a/adev/src/index.html b/adev/src/index.html
15-
index f6d4c0eb48..292608d443 100644
15+
index c000bd4d26..21a860798e 100644
1616
--- a/adev/src/index.html
1717
+++ b/adev/src/index.html
1818
@@ -1,6 +1,6 @@
@@ -23,7 +23,7 @@ index f6d4c0eb48..292608d443 100644
2323
<head>
2424
<script>
2525
// This logic must execute early, so that we set the necessary
26-
@@ -42,13 +42,13 @@
26+
@@ -42,12 +42,12 @@
2727
</style>
2828

2929
<meta charset="utf-8" />
@@ -33,20 +33,16 @@ index f6d4c0eb48..292608d443 100644
3333
<meta name="viewport" content="width=device-width, initial-scale=1" />
3434

3535
<!-- Primary Meta Tags -->
36-
- <meta name="title" content="Angular" />
3736
- <meta name="description" content="The web development framework for building modern apps." />
38-
+ <meta name="title" content="Angular 日本語版" />
3937
+ <meta name="description" content="モダンなアプリを構築するためのウェブ開発フレームワーク" />
40-
41-
<!-- Favicons -->
42-
<link rel="apple-touch-icon" sizes="180x180" href="/assets/icons/apple-touch-icon.png" />
43-
@@ -68,21 +68,21 @@
44-
38+
<meta name="author" content="Angular Team" />
39+
<meta
40+
name="keywords"
41+
@@ -73,10 +73,10 @@
4542
<!-- Open Graph / Facebook -->
4643
<meta property="og:type" content="website" />
47-
- <meta property="og:url" content="https://angular.dev/" />
44+
<meta property="og:url" content="https://angular.dev/" />
4845
- <meta property="og:title" content="Angular" />
49-
+ <meta property="og:url" content="https://angular.jp/" />
5046
+ <meta property="og:title" content="Angular 日本語版" />
5147
<meta
5248
property="og:description"
@@ -55,11 +51,11 @@ index f6d4c0eb48..292608d443 100644
5551
/>
5652
<meta property="og:image" content="https://angular.dev/assets/images/ng-image.jpg" />
5753

58-
<!-- Twitter -->
54+
@@ -85,10 +85,10 @@
55+
<meta name="twitter:creator" content="@Angular" />
5956
<meta property="twitter:card" content="summary_large_image" />
60-
- <meta property="twitter:url" content="https://angular.dev/" />
57+
<meta property="twitter:url" content="https://angular.dev/" />
6158
- <meta property="twitter:title" content="Angular" />
62-
+ <meta property="twitter:url" content="https://angular.jp/" />
6359
+ <meta property="twitter:title" content="Angular 日本語版" />
6460
<meta
6561
property="twitter:description"

‎tools/adev-patches/replace-canonical-host.patch‎

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
diff --git a/adev/src/app/core/services/header.service.ts b/adev/src/app/core/services/header.service.ts
2-
index ac27b818c4..9b34429ee9 100644
2+
index ac27b818c4..3c087a04bb 100644
33
--- a/adev/src/app/core/services/header.service.ts
44
+++ b/adev/src/app/core/services/header.service.ts
5-
@@ -9,7 +9,7 @@
5+
@@ -3,13 +3,13 @@
6+
* Copyright Google LLC All Rights Reserved.
7+
*
8+
* Use of this source code is governed by an MIT-style license that can be
9+
- * found in the LICENSE file at https://angular.dev/license
10+
+ * found in the LICENSE file at https://angular.jp/license
11+
*/
12+
613
import {DOCUMENT} from '@angular/common';
714
import {Injectable, inject} from '@angular/core';
815

@@ -11,12 +18,11 @@ index ac27b818c4..9b34429ee9 100644
1118

1219
/**
1320
* Information about the deployment of this application.
14-
1521
diff --git a/adev/src/index.html b/adev/src/index.html
16-
index 4b15ccb87c..923c9e1799 100644
22+
index c000bd4d26..e16df8f161 100644
1723
--- a/adev/src/index.html
1824
+++ b/adev/src/index.html
19-
@@ -58,7 +58,7 @@
25+
@@ -62,7 +62,7 @@
2026
<link rel="manifest" href="/assets/icons/site.webmanifest" />
2127
<link rel="mask-icon" href="/assets/icons/safari-pinned-tab.svg" color="#e90464" />
2228
<link rel="shortcut icon" href="/assets/icons/favicon.ico" />
@@ -25,3 +31,33 @@ index 4b15ccb87c..923c9e1799 100644
2531

2632
<meta name="apple-mobile-web-app-title" content="Angular" />
2733
<meta name="application-name" content="Angular" />
34+
@@ -72,25 +72,25 @@
35+
36+
<!-- Open Graph / Facebook -->
37+
<meta property="og:type" content="website" />
38+
- <meta property="og:url" content="https://angular.dev/" />
39+
+ <meta property="og:url" content="https://angular.jp/" />
40+
<meta property="og:title" content="Angular" />
41+
<meta
42+
property="og:description"
43+
content="The web development framework for building modern apps."
44+
/>
45+
- <meta property="og:image" content="https://angular.dev/assets/images/ng-image.jpg" />
46+
+ <meta property="og:image" content="https://angular.jp/assets/images/ng-image.jpg" />
47+
48+
<!-- Twitter -->
49+
<meta name="twitter:site" content="@Angular" />
50+
<meta name="twitter:creator" content="@Angular" />
51+
<meta property="twitter:card" content="summary_large_image" />
52+
- <meta property="twitter:url" content="https://angular.dev/" />
53+
+ <meta property="twitter:url" content="https://angular.jp/" />
54+
<meta property="twitter:title" content="Angular" />
55+
<meta
56+
property="twitter:description"
57+
content="The web development framework for building modern apps."
58+
/>
59+
- <meta property="twitter:image" content="https://angular.dev/assets/images/ng-image.jpg" />
60+
+ <meta property="twitter:image" content="https://angular.jp/assets/images/ng-image.jpg" />
61+
62+
<!-- Fonts -->
63+
<link rel="preconnect" href="https://fonts.googleapis.com" />

‎tools/adev-patches/replace-environment-values.patch‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
diff --git a/adev/src/app/environment.ts b/adev/src/app/environment.ts
2-
index 30f0d78db3..ed6d52c14a 100644
2+
index 733b01d357..c84ac6bf7c 100644
33
--- a/adev/src/app/environment.ts
44
+++ b/adev/src/app/environment.ts
5-
@@ -11,9 +11,9 @@ export default {
5+
@@ -11,11 +11,11 @@ export default {
66
// Those values are publicly visible in the search request headers, and presents search-only keys.
77
// https://www.algolia.com/doc/guides/security/api-keys/#search-only-api-key
88
algolia: {
99
- appId: 'L1XWT2UJ7F',
1010
- apiKey: 'dfca7ed184db27927a512e5c6668b968',
11-
- indexName: 'angular_v17',
1211
+ appId: 'D4RZISVST0',
1312
+ apiKey: '77e5a0684280325e2e1f313e0fcc11b8',
13+
// The indexName value must match the branch it's on.
14+
// So it needs to be updated on release of the new major on the patch branch.
15+
- indexName: 'angular_next_dev',
1416
+ indexName: 'angular_jp_v19',
1517
},
1618
- googleAnalyticsId: 'G-XB6NEVW32B',

‎tools/adev-patches/translate-top-level-banner.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
diff --git a/adev/src/app/app.component.html b/adev/src/app/app.component.html
2-
index e589f35912..828b3c43b7 100644
2+
index 5977c3aa81..3a61a9c28e 100644
33
--- a/adev/src/app/app.component.html
44
+++ b/adev/src/app/app.component.html
55
@@ -2,7 +2,7 @@
66

77
@defer (when isBrowser) {
88
<adev-progress-bar />
9-
- <docs-top-level-banner expiry="2024-12-10" id="state-of-js-2024" link="https://survey.devographics.com/en-US/survey/state-of-js/2024?source=angular_homepage" text="Share your experience with Angular in The State of JavaScript 2024 survey" />
10-
+ <docs-top-level-banner expiry="2024-12-10" id="state-of-js-2024" link="https://survey.devographics.com/en-US/survey/state-of-js/2024?source=angular_homepage" text="State of JavaScript 2024 アンケートであなたの経験を共有しましょう!" />
9+
- <docs-top-level-banner expiry="2025-10-20" id="state-of-js-2025" link="https://survey.devographics.com/en-US/survey/state-of-js/2025?source=angular_homepage" text="Share your experience with Angular in The State of JavaScript 2025 survey" />
10+
+ <docs-top-level-banner expiry="2025-10-20" id="state-of-js-2025" link="https://survey.devographics.com/en-US/survey/state-of-js/2025?source=angular_homepage" text="State of JavaScript 2025 アンケートであなたの経験を共有しましょう!" />
1111
}
1212

1313
<div class="adev-nav"></div>

0 commit comments

Comments
 (0)