From 62aa7393c882e9d0206d4f320c776b12a3fc6230 Mon Sep 17 00:00:00 2001
From: Alan Agius <alanagius@google.com>
Date: Thu, 12 Oct 2023 13:15:27 +0000
Subject: [PATCH] test: ensure to use the correct version for `@angular/ssr`
 packages

This commit fixes an issue that causes update tests to fail when we are in feature freeze
---
 .../migrations/update-17/replace-nguniversal-engines.ts    | 2 +-
 packages/schematics/angular/ssr/index.ts                   | 2 +-
 packages/schematics/angular/utility/latest-versions.ts     | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-17/replace-nguniversal-engines.ts b/packages/schematics/angular/migrations/update-17/replace-nguniversal-engines.ts
index 31d39c09f3..5c5cd4cc8e 100644
--- a/packages/schematics/angular/migrations/update-17/replace-nguniversal-engines.ts
+++ b/packages/schematics/angular/migrations/update-17/replace-nguniversal-engines.ts
@@ -90,7 +90,7 @@ export default function (): Rule {
       removePackageJsonDependency(tree, '@nguniversal/express-engine');
       removePackageJsonDependency(tree, '@nguniversal/common');
     },
-    addDependency('@angular/ssr', latestVersions.Angular),
+    addDependency('@angular/ssr', latestVersions.AngularSSR),
   ]);
 }
 
diff --git a/packages/schematics/angular/ssr/index.ts b/packages/schematics/angular/ssr/index.ts
index e88a6fd147..433de59993 100644
--- a/packages/schematics/angular/ssr/index.ts
+++ b/packages/schematics/angular/ssr/index.ts
@@ -207,7 +207,7 @@ function updateWebpackBuilderServerTsConfigRule(options: SSROptions): Rule {
 
 function addDependencies(): Rule {
   return chain([
-    addDependency('@angular/ssr', '^0.0.0-PLACEHOLDER', {
+    addDependency('@angular/ssr', latestVersions.AngularSSR, {
       type: DependencyType.Default,
     }),
     addDependency('express', latestVersions['express'], {
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 1f1f183386..bdceb028ab 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -9,6 +9,7 @@
 export const latestVersions: Record<string, string> & {
   Angular: string;
   DevkitBuildAngular: string;
+  AngularSSR: string;
 } = {
   // We could have used TypeScripts' `resolveJsonModule` to make the `latestVersion` object typesafe,
   // but ts_library doesn't support JSON inputs.
@@ -17,8 +18,6 @@ export const latestVersions: Record<string, string> & {
   // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
   Angular: '^17.0.0-next.0',
 
-  // Since @angular-devkit/build-angular and @schematics/angular are always
-  // published together from the same monorepo, and they are both
-  // non-experimental, they will always have the same version.
-  DevkitBuildAngular: '^' + require('../package.json')['version'],
+  DevkitBuildAngular: '^0.0.0-PLACEHOLDER',
+  AngularSSR: '^0.0.0-PLACEHOLDER',
 };