Skip to content

Commit c829b4a

Browse files
committed
Remove --frozen-lockfile from this PR.
1 parent 3975551 commit c829b4a

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

apps/rush-lib/src/logic/InstallManager.ts

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,22 +1297,14 @@ export class InstallManager {
12971297
// last install flag, which encapsulates the entire installation
12981298
args.push('--no-lock');
12991299

1300-
if (!this._options.allowShrinkwrapUpdates) {
1301-
if (semver.gte(this._rushConfiguration.packageManagerToolVersion, '3.0.0')) {
1302-
args.push('--frozen-lockfile');
1303-
} else {
1304-
args.push('--frozen-shrinkwrap');
1305-
}
1300+
// Ensure that Rush's tarball dependencies get synchronized properly with the pnpm-lock.yaml file.
1301+
// See this GitHub issue: https://github.com/pnpm/pnpm/issues/1342
1302+
if (semver.gte(this._rushConfiguration.packageManagerToolVersion, '3.0.0')) {
1303+
args.push('--no-prefer-frozen-lockfile');
13061304
} else {
1307-
1308-
// Ensure that Rush's tarball dependencies get synchronized properly with the pnpm-lock.yaml file.
1309-
// See this GitHub issue: https://github.com/pnpm/pnpm/issues/1342
1310-
if (semver.gte(this._rushConfiguration.packageManagerToolVersion, '3.0.0')) {
1311-
args.push('--no-prefer-frozen-lockfile');
1312-
} else {
1313-
args.push('--no-prefer-frozen-shrinkwrap');
1314-
}
1305+
args.push('--no-prefer-frozen-shrinkwrap');
13151306
}
1307+
13161308
if (options.collectLogFile) {
13171309
args.push('--reporter', 'ndjson');
13181310
}

0 commit comments

Comments
 (0)