Skip to content

Commit 4557318

Browse files
authored
Merge branch 'main' into conroy/diff-refactor
2 parents ba86ac0 + a15e73e commit 4557318

File tree

24 files changed

+239
-125
lines changed

24 files changed

+239
-125
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.projen/tasks.json

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.projenrc.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ const repoProject = new yarn.Monorepo({
199199
includeRootWorkspace: true,
200200
},
201201
nx: true,
202+
buildWithNx: true,
202203

203204
eslintOptions: {
204205
dirs: ['lib'],
@@ -305,6 +306,11 @@ function genericCdkProps(props: GenericProps = {}) {
305306
authorUrl: 'https://aws.amazon.com',
306307
authorOrganization: true,
307308
releasableCommits: pj.ReleasableCommits.featuresAndFixes('.'),
309+
tsJestOptions: {
310+
transformOptions: {
311+
isolatedModules: true,
312+
},
313+
},
308314
jestOptions: {
309315
configFilePath: 'jest.config.json',
310316
junitReporting: false,

nx.json

Lines changed: 3 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/cdk-cli-wrapper/jest.config.json

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/cli-lib-alpha/jest.config.json

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/cli-plugin-contract/jest.config.json

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/cloud-assembly-schema/jest.config.json

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/cloudformation-diff/jest.config.json

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)