From 7c73bfb826cf966c906c2e897ecc25f1369c0d6c Mon Sep 17 00:00:00 2001 From: Shiv Lakshminarayan Date: Tue, 15 Oct 2019 02:00:37 -0700 Subject: [PATCH] chore: update bump script to use lerna flag --exact (#4510) Follow-up to #4470 - specifying this flag to specify cross-dependency version numbers exactly rather than with a caret(^). Minor fix to display the expected version when we're checking that dependencies use point versions. --- bump.sh | 2 +- packages/@aws-cdk/core/lib/construct.ts | 2 +- tools/pkglint/lib/rules.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bump.sh b/bump.sh index 8994cc81a4962..549bd91cbefa1 100755 --- a/bump.sh +++ b/bump.sh @@ -21,7 +21,7 @@ export NODE_OPTIONS="--max-old-space-size=4096 ${NODE_OPTIONS:-}" /bin/bash ./install.sh -npx lerna version ${version} --force-publish=* --no-git-tag-version --no-push +npx lerna version ${version} --exact --force-publish=* --no-git-tag-version --no-push # Another round of install to fix package-lock.jsons /bin/bash ./install.sh diff --git a/packages/@aws-cdk/core/lib/construct.ts b/packages/@aws-cdk/core/lib/construct.ts index 025d97e23afef..8c44ed54a0110 100644 --- a/packages/@aws-cdk/core/lib/construct.ts +++ b/packages/@aws-cdk/core/lib/construct.ts @@ -196,7 +196,7 @@ export class ConstructNode { /** * Returns the child construct that has the id `Default` or `Resource"`. * This is usually the construct that provides the bulk of the underlying functionality. - * Useful for modifications of the underlying construct that are not avialable at the higher levels. + * Useful for modifications of the underlying construct that are not available at the higher levels. * * @throws if there is more than one child * @returns a construct or undefined if there is no default child diff --git a/tools/pkglint/lib/rules.ts b/tools/pkglint/lib/rules.ts index 66fbf12db16bf..e60bd95dbb900 100644 --- a/tools/pkglint/lib/rules.ts +++ b/tools/pkglint/lib/rules.ts @@ -653,7 +653,7 @@ export class MustDependonCdkByPointVersions extends ValidationRule { pkg.report({ ruleName: this.name, - message: `dependency ${depName}: dependency version must be ${monoRepoVersion}`, + message: `dependency ${depName}: dependency version must be ${expectedVersion}`, fix: () => pkg.addDependency(depName, expectedVersion) }); }