@@ -16,18 +16,27 @@ const bzlConfigPath = join(currentDir, '../../packages.bzl');
1616 *
1717 * `N.x.x` requires Angular `^N.0.0 || (N+1).0.0`
1818 * `N.0.0-x` requires Angular `^N.0.0-0 || (N+1).0.0`
19+ * `N.x.0-x` requires Angular `^N.0.0 || ^N.x.0-x || (N+1).0.0`
1920 *
2021 * The rationale is that we want to satisfy peer dependencies if we are publishing
2122 * pre-releases for a major while Angular framework cuts pre-releases as well. e.g.
2223 * Angular CDK v14.0.0-rc.1 should also work with `@angular/core@v14.0.0-rc.1`.
2324 */
2425export async function assertValidFrameworkPeerDependency ( newVersion : semver . SemVer ) {
2526 const currentVersionRange = _extractAngularVersionPlaceholderOrThrow ( ) ;
26- const isMajorWithPrerelease =
27- newVersion . minor === 0 && newVersion . patch === 0 && ! ! newVersion . prerelease [ 0 ] ;
28- const requiredRange = isMajorWithPrerelease
29- ? `^${ newVersion . major } ${ newVersion . major + 1 }
30- : `^${ newVersion . major } ${ newVersion . major + 1 } ;
27+ const isMinor = newVersion . minor !== 0 ;
28+ const isPrerelease = ! ! newVersion . prerelease [ 0 ] ;
29+ let requiredRange : string ;
30+ 31+ if ( isPrerelease ) {
32+ requiredRange = isMinor
33+ ? `^${ newVersion . major } ${ newVersion . major } ${ newVersion . minor } ${
34+ newVersion . major + 1
35+ } .0.0`
36+ : `^${ newVersion . major } ${ newVersion . major + 1 } ;
37+ } else {
38+ requiredRange = `^${ newVersion . major } ${ newVersion . major + 1 } ;
39+ }
3140
3241 if ( requiredRange !== currentVersionRange ) {
3342 Log . error (
0 commit comments