Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/adev-preview-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
submodules: true
- name: setup pnpm
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # 4.1.0
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
with:
node-version-file: '.node-version'
cache: yarn
cache: pnpm
- uses: bazel-contrib/setup-bazel@e403ad507104847c3539436f64a9e9eecc73eeec # 0.8.5
with:
bazelisk-cache: true
Expand All @@ -43,8 +45,8 @@ jobs:

# CI supports colors but Bazel does not detect it.
common --color=yes
- run: yarn install
- run: yarn build
- run: pnpm install --frozen-lockfile
- run: pnpm run build
- uses: angular/dev-infra/github-actions/previews/pack-and-upload-artifact@01c8c16f830d02110c28640aea16f145a7937080
with:
workflow-artifact-name: 'adev-preview'
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/adev-production-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
submodules: true
- name: setup pnpm
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # 4.1.0
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
with:
node-version-file: '.node-version'
cache: yarn
cache: pnpm
- uses: bazel-contrib/setup-bazel@e403ad507104847c3539436f64a9e9eecc73eeec # 0.8.5
with:
bazelisk-cache: true
Expand All @@ -35,8 +37,8 @@ jobs:

# CI supports colors but Bazel does not detect it.
common --color=yes
- run: yarn install
- run: yarn build
- run: pnpm install --frozen-lockfile
- run: pnpm run build
- name: Deploy to Firebase Hosting
uses: FirebaseExtended/action-hosting-deploy@0cbcac4740c2bfb00d632f0b863b57713124eb5a # v0.9.0
with:
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,34 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
submodules: true
- name: setup pnpm
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # 4.1.0
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
with:
node-version-file: '.node-version'
cache: yarn
- run: yarn install
- run: yarn lint
- run: yarn test
cache: pnpm
- run: pnpm install
- run: pnpm run lint
- run: pnpm run test
build-ubuntu:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
submodules: true
- name: setup pnpm
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # 4.1.0
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
with:
node-version-file: '.node-version'
cache: yarn
cache: pnpm
- uses: bazel-contrib/setup-bazel@0.15.0 # 0.15.0
with:
bazelisk-cache: true
disk-cache: true
repository-cache: true
- run: yarn install
- run: yarn build
- run: pnpm install
- run: pnpm run build
# build-windows:
# runs-on: windows-latest
# steps:
Expand Down
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@ $ git clone git@github.com:angular/angular-ja.git
このリポジトリではsubmoduleを使って翻訳元リポジトリと統合しています。初回のビルド時にsubmoduleの同期やビルドディレクトリの初期化が行われます。15分ほどかかることがあるため、気長にお待ちください。

```
$ yarn install
$ yarn build
$ pnpm install
$ pnpm build
```

### 開発用サーバーを使った作業

開発用ローカルサーバーを起動すると、ビルド結果を確認しながら翻訳作業ができます。

```
$ yarn start
$ pnpm start
```

- デフォルトでは `http://localhost:4200` でサーバーが立ち上がります
Expand All @@ -68,15 +68,15 @@ $ yarn start
`start` コマンドでは、翻訳用にパッチが適用されたアプリケーションコードを含む `build` ディレクトリを初期化せずに再利用します。初期化して開始したい場合は、 `--init` オプションを指定してください。

```
$ yarn start --init
$ pnpm start --init
```

### 文体チェック・自動修正

textlintを使って文体チェックを行うことができます。次のコマンドで文体チェックを行い、自動修正を行うことができます。

```
$ yarn lint [--fix]
$ pnpm lint [--fix]
```


Expand All @@ -85,7 +85,7 @@ $ yarn lint [--fix]
次のコマンドでデプロイ可能な生成物をビルドします。

```
$ yarn build
$ pnpm build
```

ビルドが完了すると、 `build/dist/bin/adev/build` ディレクトリにビルド結果が出力されます。
Expand Down
2 changes: 1 addition & 1 deletion UPDATE_ORIGIN.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ GitHub上で `angular/angular` リポジトリのコミットハッシュを入
1で入手したコミットハッシュを指定して、`angular/angular` リポジトリを更新します。

```sh
$ yarn update-origin <commit-hash>
$ pnpm update-origin <commit-hash>
```

コミットハッシュを指定しない場合は、originの更新は行わず、現在のsubmoduleからファイルのコピーを再度実行します。
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@
<ul class="adev-mini-menu" cdkMenu>
<li>
<a
[href]="YOUTUBE"
[href]="ngLinks.YOUTUBE"
cdkMenuItem
title="Angular YouTube channel"
target="_blank"
Expand All @@ -327,7 +327,7 @@
</li>
<li>
<a
[href]="X"
[href]="ngLinks.X"
cdkMenuItem
title="Angular X (formerly Twitter) profile"
target="_blank"
Expand All @@ -349,7 +349,7 @@
</li>
<li>
<a
[href]="BLUESKY"
[href]="ngLinks.BLUESKY"
cdkMenuItem
title="Angular Bluesky profile"
target="_blank"
Expand All @@ -370,7 +370,7 @@
</li>
<li>
<a
[href]="MEDIUM"
[href]="ngLinks.MEDIUM"
cdkMenuItem
title="Angular Medium blog"
target="_blank"
Expand All @@ -385,7 +385,7 @@
</a>
</li>
<li>
<a [href]="GITHUB" cdkMenuItem title="Angular Github" target="_blank" rel="noopener">
<a [href]="ngLinks.GITHUB" cdkMenuItem title="Angular Github" target="_blank" rel="noopener">
<!-- Github Icon -->
<svg
width="20"
Expand All @@ -403,7 +403,7 @@
</a>
</li>
<li>
<a [href]="DISCORD" cdkMenuItem title="Angular Discord" target="_blank" rel="noopener">
<a [href]="ngLinks.DISCORD" cdkMenuItem title="Angular Discord" target="_blank" rel="noopener">
<!-- Discord Icon -->
<svg
xmlns="http://www.w3.org/2000/svg"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@
<ul class="adev-mini-menu" cdkMenu>
<li>
<a
[href]="YOUTUBE"
[href]="ngLinks.YOUTUBE"
cdkMenuItem
title="Angular YouTube channel"
target="_blank"
Expand All @@ -327,7 +327,7 @@
</li>
<li>
<a
[href]="X"
[href]="ngLinks.X"
cdkMenuItem
title="Angular X (formerly Twitter) profile"
target="_blank"
Expand All @@ -349,7 +349,7 @@
</li>
<li>
<a
[href]="BLUESKY"
[href]="ngLinks.BLUESKY"
cdkMenuItem
title="Angular Bluesky profile"
target="_blank"
Expand All @@ -370,7 +370,7 @@
</li>
<li>
<a
[href]="MEDIUM"
[href]="ngLinks.MEDIUM"
cdkMenuItem
title="Angular Medium blog"
target="_blank"
Expand All @@ -385,7 +385,7 @@
</a>
</li>
<li>
<a [href]="GITHUB" cdkMenuItem title="Angular Github" target="_blank" rel="noopener">
<a [href]="ngLinks.GITHUB" cdkMenuItem title="Angular Github" target="_blank" rel="noopener">
<!-- Github Icon -->
<svg
width="20"
Expand All @@ -403,7 +403,7 @@
</a>
</li>
<li>
<a [href]="DISCORD" cdkMenuItem title="Angular Discord" target="_blank" rel="noopener">
<a [href]="ngLinks.DISCORD" cdkMenuItem title="Angular Discord" target="_blank" rel="noopener">
<!-- Discord Icon -->
<svg
xmlns="http://www.w3.org/2000/svg"
Expand Down
49 changes: 47 additions & 2 deletions adev-ja/src/app/sub-navigation-data.en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,12 @@ const DOCS_SUB_NAVIGATION_DATA: NavigationItem[] = [
path: 'guide/routing/lifecycle-and-events',
contentPath: 'guide/routing/lifecycle-and-events',
},
{
label: 'Testing routing and navigation',
path: 'guide/routing/testing',
contentPath: 'guide/routing/testing',
status: 'new',
},
{
label: 'Other routing tasks',
path: 'guide/routing/common-router-tasks',
Expand All @@ -382,11 +388,22 @@ const DOCS_SUB_NAVIGATION_DATA: NavigationItem[] = [
path: 'guide/routing/routing-with-urlmatcher',
contentPath: 'guide/routing/routing-with-urlmatcher',
},
{
label: 'Rendering strategies',
path: 'guide/routing/rendering-strategies',
contentPath: 'guide/routing/rendering-strategies',
status: 'new',
},
{
label: 'Router reference',
path: 'guide/routing/router-reference',
contentPath: 'guide/routing/router-reference',
},
{
label: 'Route transition animations',
path: 'guide/routing/route-transition-animations',
contentPath: 'guide/routing/route-transition-animations',
},
],
},
{
Expand Down Expand Up @@ -522,6 +539,12 @@ const DOCS_SUB_NAVIGATION_DATA: NavigationItem[] = [
path: 'guide/testing/pipes',
contentPath: 'guide/testing/pipes',
},
{
label: 'Testing routing and navigation',
path: 'guide/routing/testing',
contentPath: 'guide/routing/testing',
status: 'new',
},
{
label: 'Debugging tests',
path: 'guide/testing/debugging',
Expand Down Expand Up @@ -621,16 +644,23 @@ const DOCS_SUB_NAVIGATION_DATA: NavigationItem[] = [
},
{
label: 'Animations',
status: 'updated',
children: [
{
label: 'Animating your content',
path: 'guide/animations/css',
contentPath: 'guide/animations/css',
},
{
label: 'Enter and Leave animations',
path: 'guide/animations/enter-and-leave',
contentPath: 'guide/animations/enter-and-leave',
status: 'new',
},
{
label: 'Route transition animations',
path: 'guide/animations/route-animations',
contentPath: 'guide/animations/route-animations',
path: 'guide/routing/route-transition-animations',
contentPath: 'guide/routing/route-transition-animations',
},
],
},
Expand Down Expand Up @@ -922,6 +952,11 @@ const DOCS_SUB_NAVIGATION_DATA: NavigationItem[] = [
path: 'ecosystem/rxjs-interop/output-interop',
contentPath: 'ecosystem/rxjs-interop/output-interop',
},
{
label: 'Unsubscribing with takeUntilDestroyed',
path: 'ecosystem/rxjs-interop/take-until-destroyed',
contentPath: 'ecosystem/rxjs-interop/take-until-destroyed',
},
],
},
{
Expand Down Expand Up @@ -974,6 +1009,12 @@ const DOCS_SUB_NAVIGATION_DATA: NavigationItem[] = [
path: 'ecosystem/custom-build-pipeline',
contentPath: 'ecosystem/custom-build-pipeline',
},
{
label: 'Tailwind',
path: 'guide/tailwind',
contentPath: 'guide/tailwind',
status: 'new',
},
{
label: 'Angular Fire',
path: 'https://github.com/angular/angularfire#readme',
Expand Down Expand Up @@ -1135,6 +1176,10 @@ const REFERENCE_SUB_NAVIGATION_DATA: NavigationItem[] = [
label: 'Overview',
path: 'cli/generate',
},
{
label: 'ai-config',
path: 'cli/generate/ai-config',
},
{
label: 'app-shell',
path: 'cli/generate/app-shell',
Expand Down
Loading