Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-22 23:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: ensure to use the correct version for @angular/ssr packages

Browse Source 
This commit fixes an issue that causes update tests to fail when we are in feature freeze
This commit is contained in:
Alan Agius 2023-10-12 13:15:27 +00:00 committed by Alan Agius
parent 55422d5fa4
commit 62aa7393c8
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/schematics/angular/migrations/update-17/replace-nguniversal-engines.ts
View File

@ -90,7 +90,7 @@ export default function (): Rule {
removePackageJsonDependency(tree, '@nguniversal/express-engine'); removePackageJsonDependency(tree, '@nguniversal/express-engine');
removePackageJsonDependency(tree, '@nguniversal/common'); removePackageJsonDependency(tree, '@nguniversal/common');
}, },
addDependency('@angular/ssr', latestVersions.Angular), addDependency('@angular/ssr', latestVersions.AngularSSR),
]); ]);
} }

2
packages/schematics/angular/ssr/index.ts
View File

@ -207,7 +207,7 @@ function updateWebpackBuilderServerTsConfigRule(options: SSROptions): Rule {
function addDependencies(): Rule { function addDependencies(): Rule {
return chain([ return chain([
addDependency('@angular/ssr', '^0.0.0-PLACEHOLDER', { addDependency('@angular/ssr', latestVersions.AngularSSR, {
type: DependencyType.Default, type: DependencyType.Default,
}), }),
addDependency('express', latestVersions['express'], { addDependency('express', latestVersions['express'], {

7
packages/schematics/angular/utility/latest-versions.ts
View File

@ -9,6 +9,7 @@
export const latestVersions: Record<string, string> & { export const latestVersions: Record<string, string> & {
Angular: string; Angular: string;
DevkitBuildAngular: string; DevkitBuildAngular: string;
AngularSSR: string;
} = { } = {
// We could have used TypeScripts' `resolveJsonModule` to make the `latestVersion` object typesafe, // We could have used TypeScripts' `resolveJsonModule` to make the `latestVersion` object typesafe,
// but ts_library doesn't support JSON inputs. // 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 // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
Angular: '^17.0.0-next.0', Angular: '^17.0.0-next.0',
// Since @angular-devkit/build-angular and @schematics/angular are always DevkitBuildAngular: '^0.0.0-PLACEHOLDER',
// published together from the same monorepo, and they are both AngularSSR: '^0.0.0-PLACEHOLDER',
// non-experimental, they will always have the same version.
DevkitBuildAngular: '^' + require('../package.json')['version'],
}; };