@schematics/angular 17.3.1 → 17.3.3

package/guard/implements-files/__name@dasherize__.guard.ts.template

@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
 import { <%= routerImports %> } from '@angular/router';
-import { Observable } from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
@@ -8,24 +7,24 @@ import { Observable } from 'rxjs';
 export class <%= classify(name) %>Guard implements <%= implementations %> {
   <% if (implements.includes('CanActivate')) { %>canActivate(
     route: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
+    state: RouterStateSnapshot): MaybeAsync<GuardResult> {
     return true;
   }
   <% } %><% if (implements.includes('CanActivateChild')) { %>canActivateChild(
     childRoute: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
+    state: RouterStateSnapshot): MaybeAsync<GuardResult> {
     return true;
   }
   <% } %><% if (implements.includes('CanDeactivate')) { %>canDeactivate(
     component: unknown,
     currentRoute: ActivatedRouteSnapshot,
     currentState: RouterStateSnapshot,
-    nextState?: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
+    nextState?: RouterStateSnapshot): MaybeAsync<GuardResult> {
     return true;
   }
   <% } %><% if (implements.includes('CanMatch')) { %>canMatch(
     route: Route,
-    segments: UrlSegment[]): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
+    segments: UrlSegment[]): MaybeAsync<GuardResult> {
     return true;
   }<% } %>
 }

package/guard/index.js

@@ -26,7 +26,7 @@ function default_1(options) {
             .map((implement) => (implement === 'CanDeactivate' ? 'CanDeactivate<unknown>' : implement))
             .join(', ');
         const commonRouterNameImports = ['ActivatedRouteSnapshot', 'RouterStateSnapshot'];
-        const routerNamedImports = [...options.implements, 'UrlTree'];
+        const routerNamedImports = [...options.implements, 'MaybeAsync', 'GuardResult'];
         if (options.implements.includes(schema_1.Implement.CanMatch)) {
             routerNamedImports.push('Route', 'UrlSegment');
             if (options.implements.length > 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "17.3.1",
+  "version": "17.3.3",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -23,8 +23,8 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "17.3.1",
-    "@angular-devkit/schematics": "17.3.1",
+    "@angular-devkit/core": "17.3.3",
+    "@angular-devkit/schematics": "17.3.3",
     "jsonc-parser": "3.2.1"
   },
   "repository": {

package/utility/latest-versions/package.json

@@ -3,6 +3,7 @@
   "comment": "This file is needed so that dependencies are synced by Renovate.",
   "private": true,
   "dependencies": {
+    "@angular/core": "^17.3.0",
     "@types/express": "^4.17.17",
     "@types/jasmine": "~5.1.0",
     "@types/node": "^18.18.0",

package/utility/latest-versions.js

@@ -8,12 +8,13 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.latestVersions = void 0;
+// We could have used TypeScripts' `resolveJsonModule` to make the `latestVersion` object typesafe,
+// but ts_library doesn't support JSON inputs.
+const dependencies = require('./latest-versions/package.json')['dependencies'];
 exports.latestVersions = {
-    // We could have used TypeScripts' `resolveJsonModule` to make the `latestVersion` object typesafe,
-    // but ts_library doesn't support JSON inputs.
-    ...require('./latest-versions/package.json')['dependencies'],
+    ...dependencies,
     // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
-    Angular: '^17.3.0',
-    DevkitBuildAngular: '^17.3.1',
-    AngularSSR: '^17.3.1',
+    Angular: dependencies['@angular/core'],
+    DevkitBuildAngular: '^17.3.3',
+    AngularSSR: '^17.3.3',
 };