chore: isolate CoreConstruct imports to avoid merge conflicts #12850
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
nija-at
force-pushed
the
nija-at/eslint-coreconstruct
branch
from
d5c65b8
to
43e920c
Compare
eladb
approved these changes
Feb 4, 2021
|
Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
|
Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
NovakGu
pushed a commit
to NovakGu/aws-cdk
that referenced
this pull request
Feb 18, 2021
) As part of CDKv2, the construct layer in '@aws-cdk/core' is being replaced with the constructs API in the 'constructs' module. During the transition period between v1 and v2, both exist. On the `master` branch, code will include importing `Construct` from the '@aws-cdk/core' module but this will not be possible in the `v2-main` branch where this API does not exist. Any change to the same line as the import of the `Construct` symbol will cause merge conflicts. Hence, move the import into a separate line and section to avoid these conflicts. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As part of CDKv2, the construct layer in '@aws-cdk/core' is
being replaced with the constructs API in the 'constructs'
module. During the transition period between v1 and v2,
both exist.
On the
masterbranch, code will include importingConstructfrom the '@aws-cdk/core' module but thiswill not be possible in the
v2-mainbranch where this APIdoes not exist.
Any change to the same line as the import of the
Constructsymbol will cause merge conflicts. Hence, move the import
into a separate line and section to avoid these conflicts.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license