From 900360a315db5c50e0f7a3e578e0296b7ec233d5 Mon Sep 17 00:00:00 2001 From: Suguru Inatomi Date: Thu, 11 Jul 2024 22:05:10 +0900 Subject: [PATCH 01/18] chore: update origin --- origin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/origin b/origin index 27e693691..07a0b87a4 160000 --- a/origin +++ b/origin @@ -1 +1 @@ -Subproject commit 27e693691235f1971f8a4a631631fbca25834fed +Subproject commit 07a0b87a4c1e032c92d5596ce7a17b74a87e04e3 From f4f484834a5df230ec17fcb681f76588f086dddc Mon Sep 17 00:00:00 2001 From: Suguru Inatomi Date: Thu, 11 Jul 2024 22:23:33 +0900 Subject: [PATCH 02/18] chore: build adev --- .github/workflows/build-and-test.yml | 24 ++++++++++++------------ tools/build.mjs | 8 ++++---- tools/lib/common.mjs | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index edfb85cb8..4eb8c7c16 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -46,15 +46,15 @@ jobs: # - run: yarn install # - run: yarn build # shell: pwsh - build-macos: - runs-on: macos-latest - steps: - - uses: actions/checkout@v4 - with: - submodules: true - - uses: actions/setup-node@v4 - with: - node-version-file: '.node-version' - cache: yarn - - run: yarn install - - run: yarn build + # build-macos: + # runs-on: macos-latest + # steps: + # - uses: actions/checkout@v4 + # with: + # submodules: true + # - uses: actions/setup-node@v4 + # with: + # node-version-file: '.node-version' + # cache: yarn + # - run: yarn install + # - run: yarn build diff --git a/tools/build.mjs b/tools/build.mjs index 8c7f19896..4157c865b 100644 --- a/tools/build.mjs +++ b/tools/build.mjs @@ -3,7 +3,7 @@ import { chalk } from 'zx'; import { applyPatches, - buildAIO, + buildAdev, copyLocalizedFiles, remove404HTML, copyRobots, @@ -15,11 +15,11 @@ try { console.log(chalk.green('==== setup ====')); await setup(); console.log(chalk.green('==== preBuild ====')); - await preBuild(); + // await preBuild(); console.log(chalk.green('==== build ====')); await build(); console.log(chalk.green('==== postBuild ====')); - await postBuild(); + // await postBuild(); } catch (e) { console.error(chalk.red(e)); process.exit(1); @@ -41,7 +41,7 @@ async function preBuild() { } async function build() { - await buildAIO(); + await buildAdev(); } async function postBuild() { diff --git a/tools/lib/common.mjs b/tools/lib/common.mjs index c320677da..3d652a428 100644 --- a/tools/lib/common.mjs +++ b/tools/lib/common.mjs @@ -22,18 +22,18 @@ export async function resetBuildDir({ init = false }) { } } -export async function buildAIO() { +export async function buildAdev() { await within(async () => { - cd(`${outDir}/aio`); - await $`yarn build`; + cd(`${outDir}`); + await $`yarn install --frozen-lockfile`; + await $`yarn bazel build //adev:build`; }); } export async function watchAIO() { await within(async () => { - cd(`${outDir}/aio`); - await $`yarn setup`; - await $`yarn start`; + cd(`${outDir}`); + await $`yarn docs`; }); } From 04e29427d56c188304c3fffc4c32d7b4683152d1 Mon Sep 17 00:00:00 2001 From: Suguru Inatomi Date: Fri, 12 Jul 2024 00:00:38 +0900 Subject: [PATCH 03/18] chore: add initial patches --- tools/adev-patches/change-analytics-id.patch | 11 +++ .../adev-patches/change-document-title.patch | 79 +++++++++++++++++++ tools/build.mjs | 6 +- tools/lib/common.mjs | 2 +- 4 files changed, 94 insertions(+), 4 deletions(-) create mode 100644 tools/adev-patches/change-analytics-id.patch create mode 100644 tools/adev-patches/change-document-title.patch diff --git a/tools/adev-patches/change-analytics-id.patch b/tools/adev-patches/change-analytics-id.patch new file mode 100644 index 000000000..104086fd2 --- /dev/null +++ b/tools/adev-patches/change-analytics-id.patch @@ -0,0 +1,11 @@ +diff --git a/adev/src/app/environment.ts b/adev/src/app/environment.ts +index 30f0d78db3..c6c18b5183 100644 +--- a/adev/src/app/environment.ts ++++ b/adev/src/app/environment.ts +@@ -15,5 +15,5 @@ export default { + apiKey: 'dfca7ed184db27927a512e5c6668b968', + indexName: 'angular_v17', + }, +- googleAnalyticsId: 'G-XB6NEVW32B', ++ googleAnalyticsId: 'G-ZE76R447BW', + }; diff --git a/tools/adev-patches/change-document-title.patch b/tools/adev-patches/change-document-title.patch new file mode 100644 index 000000000..989e081d7 --- /dev/null +++ b/tools/adev-patches/change-document-title.patch @@ -0,0 +1,79 @@ +diff --git a/adev/src/app/core/services/a-dev-title-strategy.ts b/adev/src/app/core/services/a-dev-title-strategy.ts +index 75a1daa0e9..6acf3ec62f 100644 +--- a/adev/src/app/core/services/a-dev-title-strategy.ts ++++ b/adev/src/app/core/services/a-dev-title-strategy.ts +@@ -13,7 +13,7 @@ import {ActivatedRouteSnapshot, RouterStateSnapshot, TitleStrategy} from '@angul + + export const ROUTE_TITLE_PROPERTY = 'label'; + export const ROUTE_PARENT_PROPERTY = 'parent'; +-export const TITLE_SUFFIX = 'Angular'; ++export const TITLE_SUFFIX = 'Angular 日本語版'; + export const TITLE_SEPARATOR = ' • '; + export const DEFAULT_PAGE_TITLE = 'Overview'; + +diff --git a/adev/src/index.html b/adev/src/index.html +index f6d4c0eb48..292608d443 100644 +--- a/adev/src/index.html ++++ b/adev/src/index.html +@@ -1,6 +1,6 @@ + + +- ++ + +