diff --git a/changelog_unreleased/angular/20014.md b/changelog_unreleased/angular/20014.md
new file mode 100644
index 000000000..3bfb0ef09
--- /dev/null
+++ b/changelog_unreleased/angular/20014.md
@@ -0,0 +1,22 @@
+#### Support `@boundary` error boundaries (#20014 by @Yahiro025)
+
+<!-- prettier-ignore -->
+```html
+<!-- Input -->
+@boundary {
+<complex-chart [data]="data"/>
+}
+@error (let err) {
+<p>{{err.message}}</p>
+}
+
+<!-- Prettier stable -->
+SyntaxError: Unexpected character "EOF" (Do you have an unescaped "{" in your template? Use "{{ '{' }}") to escape it.) (6:1)
+
+<!-- Prettier main -->
+@boundary {
+  <complex-chart [data]="data" />
+} @error (let err) {
+  <p>{{ err.message }}</p>
+}
+```
diff --git a/package.json b/package.json
index c70df16d6..36465b733 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "acorn": "8.18.0",
     "acorn-jsx": "5.3.2",
     "angular-estree-parser": "15.5.0",
-    "angular-html-parser": "10.11.0",
+    "angular-html-parser": "10.12.0",
     "camelcase": "9.0.0",
     "ci-info": "4.4.0",
     "cjk-regex": "3.4.2",
diff --git a/scripts/build/transform/index.js b/scripts/build/transform/index.js
index 34a2ce332..6079d6b63 100644
--- a/scripts/build/transform/index.js
+++ b/scripts/build/transform/index.js
@@ -28,7 +28,10 @@ const packageTransforms = new Map([
     transforms["method-at"],
     ["@glimmer/syntax", "angular-estree-parser", "espree"],
   ],
-  [transforms["object-has-own"], ["@babel/parser", "graphql"]],
+  [
+    transforms["object-has-own"],
+    ["@babel/parser", "graphql", "angular-html-parser"],
+  ],
   [transforms["string-raw"], ["camelcase", "@angular/compiler", "js-yaml"]],
   [transforms["method-is-well-formed"], ["meriyah"]],
   /* spell-checker: enable */
diff --git a/src/language-html/print/angular-control-flow-block-settings.evaluate.js b/src/language-html/print/angular-control-flow-block-settings.evaluate.js
index bc9b33c23..48243b99a 100644
--- a/src/language-html/print/angular-control-flow-block-settings.evaluate.js
+++ b/src/language-html/print/angular-control-flow-block-settings.evaluate.js
@@ -15,6 +15,8 @@ const ANGULAR_CONTROL_FLOW_BLOCK_SETTINGS = new Map(
     ["placeholder", ["placeholder", "error", "loading"]],
     ["error", ["placeholder", "error", "loading"]],
     ["loading", ["placeholder", "error", "loading"]],
+
+    ["boundary", ["error"]],
   ]
     .filter(([, followingBlockNames]) => followingBlockNames.length > 0)
     .map(([name, followingBlockNames]) => [name, new Set(followingBlockNames)]),
diff --git a/tests/format/angular/control-flow/__snapshots__/format.test.js.snap b/tests/format/angular/control-flow/__snapshots__/format.test.js.snap
index 8cf72183e..f5f199f6e 100644
--- a/tests/format/angular/control-flow/__snapshots__/format.test.js.snap
+++ b/tests/format/angular/control-flow/__snapshots__/format.test.js.snap
@@ -52,6 +52,258 @@ parsers: ["angular"]
 ================================================================================
 `;
 
+exports[`boundary.html format 1`] = `
+====================================options=====================================
+parsers: ["angular"]
+                                                      printWidth: 80 (default) |
+=====================================input======================================
+@boundary {
+  <app-risky-component />
+} @error {
+  <p>Something went wrong!</p>
+}
+
+@boundary {
+  <app-risky-component />
+} @error {
+  <p>Error occurred: {{ $error.message }}</p>
+}
+
+@boundary {
+  <app-flaky-component />
+} @error {
+  <p>Loading failed.</p>
+  <button (click)="$reset()">Try again</button>
+}
+
+@boundary {
+  <app-risky-component />
+} @error {
+  <app-error-fallback [error]="err" />
+}
+
+@boundary {
+  <app-risky-component />
+} @error (let err; retry = $reset; when isNetworkError(err)) {
+  <app-network-error [error]="err" />
+  <button (click)="retry()">Retry</button>
+} @error {
+  <app-generic-error />
+}
+
+@boundary {
+  <app-chart-dashboard />
+} @error (let err; reset = $reset; when isRenderError(err)) {
+  <p>Network issue. Check your connection.</p>
+  <button (click)="reset()">Retry</button>
+} @error {
+  <p>An unexpected error occurred: {{ $error.message }}</p>
+}
+
+@boundary {
+  <complex-chart [data]="data"/>
+} @error (let err = $error; let r = $reset) {
+  <p>Failed to load chart: {{err.message}}</p>
+  <button (click)="r()">Retry</button>
+}
+
+@boundary {
+  Outer Main
+  @boundary {
+    Inner Main
+  } @error {
+    Inner Fallback
+  }
+} @error {
+  Outer Fallback
+}
+
+@defer {
+  @boundary {
+    <app-c1/>
+  } @error {
+    <span>Render error</span>
+  }
+} @error {
+  <span>Load error</span>
+}
+
+=====================================output=====================================
+@boundary {
+  <app-risky-component />
+} @error {
+  <p>Something went wrong!</p>
+}
+
+@boundary {
+  <app-risky-component />
+} @error {
+  <p>Error occurred: {{ $error.message }}</p>
+}
+
+@boundary {
+  <app-flaky-component />
+} @error {
+  <p>Loading failed.</p>
+  <button (click)="$reset()">Try again</button>
+}
+
+@boundary {
+  <app-risky-component />
+} @error {
+  <app-error-fallback [error]="err" />
+}
+
+@boundary {
+  <app-risky-component />
+} @error (let err; retry = $reset; when isNetworkError(err)) {
+  <app-network-error [error]="err" />
+  <button (click)="retry()">Retry</button>
+} @error {
+  <app-generic-error />
+}
+
+@boundary {
+  <app-chart-dashboard />
+} @error (let err; reset = $reset; when isRenderError(err)) {
+  <p>Network issue. Check your connection.</p>
+  <button (click)="reset()">Retry</button>
+} @error {
+  <p>An unexpected error occurred: {{ $error.message }}</p>
+}
+
+@boundary {
+  <complex-chart [data]="data" />
+} @error (let err = $error; let r = $reset) {
+  <p>Failed to load chart: {{ err.message }}</p>
+  <button (click)="r()">Retry</button>
+}
+
+@boundary {
+  Outer Main
+  @boundary {
+    Inner Main
+  } @error {
+    Inner Fallback
+  }
+} @error {
+  Outer Fallback
+}
+
+@defer {
+  @boundary {
+    <app-c1 />
+  } @error {
+    <span>Render error</span>
+  }
+} @error {
+  <span>Load error</span>
+}
+
+================================================================================
+`;
+
+exports[`boundary-error-parameters.html format 1`] = `
+====================================options=====================================
+parsers: ["angular"]
+                                                      printWidth: 80 (default) |
+=====================================input======================================
+@boundary {
+  <app-risky-component />
+} @error (let err; retry 
+
+= $reset; when 
+isNetworkError(err)) {
+  <app-network-error [error]="err" />
+  <button (click)="retry()">Retry</button>
+} @error {
+  <app-generic-error />
+}
+
+@boundary {
+  <app-chart-dashboard />
+} @error (let
+err; reset
+=
+$reset; when
+isRenderError(err)) {
+  <p>Network issue. Check your connection.</p>
+  <button (click)="reset()">Retry</button>
+} @error {
+  <p>An unexpected error occurred: {{$error.message}}</p>
+}
+
+@boundary {
+  <complex-chart [data]="data"/>
+} @error (let err=$error; let r=$reset) {
+  <p>Failed to load chart: {{err.message}}</p>
+  <button (click)="r()">Retry</button>
+}
+
+@boundary {
+  Main
+} @error (let err; when err.message === '404') {
+  Not Found
+}
+
+@boundary {
+  Main
+} @error (err = $error, retry
+=
+$reset) {
+  <button (click)="retry()">Retry</button>
+}
+
+=====================================output=====================================
+@boundary {
+  <app-risky-component />
+} @error (let err; retry 
+
+= $reset; when 
+isNetworkError(err)) {
+  <app-network-error [error]="err" />
+  <button (click)="retry()">Retry</button>
+} @error {
+  <app-generic-error />
+}
+
+@boundary {
+  <app-chart-dashboard />
+} @error (let
+err; reset
+=
+$reset; when
+isRenderError(err)) {
+  <p>Network issue. Check your connection.</p>
+  <button (click)="reset()">Retry</button>
+} @error {
+  <p>An unexpected error occurred: {{ $error.message }}</p>
+}
+
+@boundary {
+  <complex-chart [data]="data" />
+} @error (let err=$error; let r=$reset) {
+  <p>Failed to load chart: {{ err.message }}</p>
+  <button (click)="r()">Retry</button>
+}
+
+@boundary {
+  Main
+} @error (let err; when err.message === '404') {
+  Not Found
+}
+
+@boundary {
+  Main
+} @error (err = $error, retry
+=
+$reset) {
+  <button (click)="retry()">Retry</button>
+}
+
+================================================================================
+`;
+
 exports[`chid.html format 1`] = `
 ====================================options=====================================
 parsers: ["angular"]
diff --git a/tests/format/angular/control-flow/boundary-error-parameters.html b/tests/format/angular/control-flow/boundary-error-parameters.html
new file mode 100644
index 000000000..5bcec9af4
--- /dev/null
+++ b/tests/format/angular/control-flow/boundary-error-parameters.html
@@ -0,0 +1,45 @@
+@boundary {
+  <app-risky-component />
+} @error (let err; retry 
+
+= $reset; when 
+isNetworkError(err)) {
+  <app-network-error [error]="err" />
+  <button (click)="retry()">Retry</button>
+} @error {
+  <app-generic-error />
+}
+
+@boundary {
+  <app-chart-dashboard />
+} @error (let
+err; reset
+=
+$reset; when
+isRenderError(err)) {
+  <p>Network issue. Check your connection.</p>
+  <button (click)="reset()">Retry</button>
+} @error {
+  <p>An unexpected error occurred: {{$error.message}}</p>
+}
+
+@boundary {
+  <complex-chart [data]="data"/>
+} @error (let err=$error; let r=$reset) {
+  <p>Failed to load chart: {{err.message}}</p>
+  <button (click)="r()">Retry</button>
+}
+
+@boundary {
+  Main
+} @error (let err; when err.message === '404') {
+  Not Found
+}
+
+@boundary {
+  Main
+} @error (err = $error, retry
+=
+$reset) {
+  <button (click)="retry()">Retry</button>
+}
diff --git a/tests/format/angular/control-flow/boundary.html b/tests/format/angular/control-flow/boundary.html
new file mode 100644
index 000000000..16d0ea579
--- /dev/null
+++ b/tests/format/angular/control-flow/boundary.html
@@ -0,0 +1,70 @@
+@boundary {
+  <app-risky-component />
+} @error {
+  <p>Something went wrong!</p>
+}
+
+@boundary {
+  <app-risky-component />
+} @error {
+  <p>Error occurred: {{ $error.message }}</p>
+}
+
+@boundary {
+  <app-flaky-component />
+} @error {
+  <p>Loading failed.</p>
+  <button (click)="$reset()">Try again</button>
+}
+
+@boundary {
+  <app-risky-component />
+} @error {
+  <app-error-fallback [error]="err" />
+}
+
+@boundary {
+  <app-risky-component />
+} @error (let err; retry = $reset; when isNetworkError(err)) {
+  <app-network-error [error]="err" />
+  <button (click)="retry()">Retry</button>
+} @error {
+  <app-generic-error />
+}
+
+@boundary {
+  <app-chart-dashboard />
+} @error (let err; reset = $reset; when isRenderError(err)) {
+  <p>Network issue. Check your connection.</p>
+  <button (click)="reset()">Retry</button>
+} @error {
+  <p>An unexpected error occurred: {{ $error.message }}</p>
+}
+
+@boundary {
+  <complex-chart [data]="data"/>
+} @error (let err = $error; let r = $reset) {
+  <p>Failed to load chart: {{err.message}}</p>
+  <button (click)="r()">Retry</button>
+}
+
+@boundary {
+  Outer Main
+  @boundary {
+    Inner Main
+  } @error {
+    Inner Fallback
+  }
+} @error {
+  Outer Fallback
+}
+
+@defer {
+  @boundary {
+    <app-c1/>
+  } @error {
+    <span>Render error</span>
+  }
+} @error {
+  <span>Load error</span>
+}
diff --git a/tests/unit/__snapshots__/angular-blocks.js.snap b/tests/unit/__snapshots__/angular-blocks.js.snap
index ad8ba0951..77cfca2d5 100644
--- a/tests/unit/__snapshots__/angular-blocks.js.snap
+++ b/tests/unit/__snapshots__/angular-blocks.js.snap
@@ -12,6 +12,7 @@ exports[`angular blocks 1`] = `
   "@defer",
   "@placeholder",
   "@loading",
+  "@boundary",
   "@error",
   "@content",
 ]
diff --git a/yarn.lock b/yarn.lock
index 0ee49979f..56874fb6a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3334,10 +3334,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"angular-html-parser@npm:10.11.0":
-  version: 10.11.0
-  resolution: "angular-html-parser@npm:10.11.0"
-  checksum: 10/b311b3e984eaba422d41ecff8ea1255c1e5d5cd86ffd88f8651b12323b33104a0099711e1f4104dfe4f4383ff926ac43df4f072bf616f5dbbc5e86ef76e33383
+"angular-html-parser@npm:10.12.0":
+  version: 10.12.0
+  resolution: "angular-html-parser@npm:10.12.0"
+  checksum: 10/d71e0faa33c3ad91d07a71f4c5878eb047bb42f506fef3b66d15c5dd94a59eba12599de186adf4518ebe28a2f58b669394943281b91aebefed35987d8e29cbbe
   languageName: node
   linkType: hard
 
@@ -8299,7 +8299,7 @@ __metadata:
     acorn: "npm:8.18.0"
     acorn-jsx: "npm:5.3.2"
     angular-estree-parser: "npm:15.5.0"
-    angular-html-parser: "npm:10.11.0"
+    angular-html-parser: "npm:10.12.0"
     base64-arraybuffer-es6: "npm:3.1.0"
     browserslist: "npm:4.28.8"
     browserslist-to-esbuild: "npm:2.1.1"