feat(migration): add constructs migration to rewrite script #14916
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
approved these changes
Jun 9, 2021
BenChaimberg
removed
the
pr/do-not-merge
|
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). |
|
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). |
mergify bot
pushed a commit
that referenced
this pull request
Jul 8, 2021
Reverts #14916 This is causing issues in the v2 forward merge. ``` import * as cdk from '@aws-cdk/core'; ``` Is being rewritten as `import * as constructs from 'constructs'`, regardless of what from `cdk` we use. In the case of https://github.com/aws/aws-cdk/blob/master/packages/@aws-cdk/assert-internal/lib/synth-utils.ts for example, we only use `cdk.Stack`, but the imports turn into: ``` import * as fs from 'fs'; import * as path from 'path'; import * as core from 'aws-cdk-lib'; import * as constructs from 'constructs'; import * as cxapi from 'aws-cdk-lib/cx-api'; ``` And then TSC complains: ``` @aws-cdk/assert: lib/synth-utils.ts(4,1): error TS6133: 'constructs' is declared but its value is never read. @aws-cdk/assert: lib/expect.ts(2,1): error TS6133: 'constructs' is declared but its value is never read. @aws-cdk/assert: jest.ts(2,1): error TS6133: 'constructs' is declared but its value is never read. @aws-cdk/assert: test/assertions.test.ts(2,13): error TS2300: Duplicate identifier 'constructs'. @aws-cdk/assert: test/assertions.test.ts(4,13): error TS2300: Duplicate identifier 'constructs'. ``` (Also note `Duplicate identifier` errors)
hollanddd
pushed a commit
to hollanddd/aws-cdk
that referenced
this pull request
Aug 26, 2021
Add support to the rewrite-imports script for removing the construct compatibility layer. This change will rewrite all imports of `Construct` that come from `@aws-cdk/core` to the one that comes from `constructs`. In particular, the following forms are supported:
- namespaced: `import * as cdk from '@aws-cdk/core'`
- adds a new import: `import * as constructs from 'constructs'`;
- barrel: `import { Construct } from '@aws-cdk/core'`
- adds a new import: `import { Construct } from 'constructs'`
- removes old import: `import { App, Construct, Stack } from '@aws-cdk/core'` => `import { App, Stack } from '@aws-cdk/core'`;
- barrel with alias: `import { Construct as CoreConstruct } from '@aws-cdk/core'`
- adds a new import: `import { Construct as CoreConstruct } from 'constructs'`
- removes old import, as above
As always, the unit tests are authoritative!
I also removed some invalid import styles but let me know if they are actually valid and I just missed something!
----
*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
hollanddd
pushed a commit
to hollanddd/aws-cdk
that referenced
this pull request
Aug 26, 2021
) Reverts aws#14916 This is causing issues in the v2 forward merge. ``` import * as cdk from '@aws-cdk/core'; ``` Is being rewritten as `import * as constructs from 'constructs'`, regardless of what from `cdk` we use. In the case of https://github.com/aws/aws-cdk/blob/master/packages/@aws-cdk/assert-internal/lib/synth-utils.ts for example, we only use `cdk.Stack`, but the imports turn into: ``` import * as fs from 'fs'; import * as path from 'path'; import * as core from 'aws-cdk-lib'; import * as constructs from 'constructs'; import * as cxapi from 'aws-cdk-lib/cx-api'; ``` And then TSC complains: ``` @aws-cdk/assert: lib/synth-utils.ts(4,1): error TS6133: 'constructs' is declared but its value is never read. @aws-cdk/assert: lib/expect.ts(2,1): error TS6133: 'constructs' is declared but its value is never read. @aws-cdk/assert: jest.ts(2,1): error TS6133: 'constructs' is declared but its value is never read. @aws-cdk/assert: test/assertions.test.ts(2,13): error TS2300: Duplicate identifier 'constructs'. @aws-cdk/assert: test/assertions.test.ts(4,13): error TS2300: Duplicate identifier 'constructs'. ``` (Also note `Duplicate identifier` errors)
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.
Add support to the rewrite-imports script for removing the construct compatibility layer. This change will rewrite all imports of
Constructthat come from@aws-cdk/coreto the one that comes fromconstructs. In particular, the following forms are supported:import * as cdk from '@aws-cdk/core'import * as constructs from 'constructs';import { Construct } from '@aws-cdk/core'import { Construct } from 'constructs'import { App, Construct, Stack } from '@aws-cdk/core'=>import { App, Stack } from '@aws-cdk/core';import { Construct as CoreConstruct } from '@aws-cdk/core'import { Construct as CoreConstruct } from 'constructs'As always, the unit tests are authoritative!
I also removed some invalid import styles but let me know if they are actually valid and I just missed something!
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license