From adf0d6e91f3ba20905986a3d890790d2be738175 Mon Sep 17 00:00:00 2001 From: Eddy Varela Date: Tue, 2 May 2023 16:21:02 -0400 Subject: [PATCH 1/4] fix e2e tests --- packages/amplify-e2e-core/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/amplify-e2e-core/package.json b/packages/amplify-e2e-core/package.json index 7d526d82390..5ba8e4d1059 100644 --- a/packages/amplify-e2e-core/package.json +++ b/packages/amplify-e2e-core/package.json @@ -31,6 +31,7 @@ "fs-extra": "^8.1.0", "graphql-transformer-core": "^8.0.3", "ini": "^1.3.5", + "jest": "^29.0.0", "jest-circus": "^27.0.0", "jest-environment-node": "^26.6.2", "lodash": "^4.17.21", From 83b33d1d9a23c7fc40eeb9232008afe302d8e671 Mon Sep 17 00:00:00 2001 From: Eddy Varela Date: Tue, 2 May 2023 16:26:29 -0400 Subject: [PATCH 2/4] add changes --- .circleci/config.base.yml | 2 ++ packages/amplify-e2e-tests/package.json | 1 + yarn.lock | 2 ++ 3 files changed, 5 insertions(+) diff --git a/.circleci/config.base.yml b/.circleci/config.base.yml index afa62ea7c9a..a2e4ae7aa2b 100644 --- a/.circleci/config.base.yml +++ b/.circleci/config.base.yml @@ -151,6 +151,8 @@ jobs: steps: - install_node_windows - checkout + - run: yarn cache clean --all + - run: YARN_CHECKSUM_BEHAVIOR=update yarn - run: yarn --immutable - run: yarn production-build - run: diff --git a/packages/amplify-e2e-tests/package.json b/packages/amplify-e2e-tests/package.json index 4f4007fdc66..529713b4504 100644 --- a/packages/amplify-e2e-tests/package.json +++ b/packages/amplify-e2e-tests/package.json @@ -52,6 +52,7 @@ "graphql-tag": "^2.10.1", "graphql-transformer-core": "^8.0.3", "isomorphic-fetch": "^3.0.0", + "jest": "^29.0.0", "lodash": "^4.17.21", "node-fetch": "^2.6.7", "rimraf": "^3.0.0", diff --git a/yarn.lock b/yarn.lock index 73e36c52270..2bf91994108 100644 --- a/yarn.lock +++ b/yarn.lock @@ -548,6 +548,7 @@ __metadata: fs-extra: ^8.1.0 graphql-transformer-core: ^8.0.3 ini: ^1.3.5 + jest: ^29.0.0 jest-circus: ^27.0.0 jest-environment-node: ^26.6.2 lodash: ^4.17.21 @@ -11739,6 +11740,7 @@ __metadata: graphql-tag: ^2.10.1 graphql-transformer-core: ^8.0.3 isomorphic-fetch: ^3.0.0 + jest: ^29.0.0 lodash: ^4.17.21 node-fetch: ^2.6.7 rimraf: ^3.0.0 From 63d9f503f1ceecaf52f70c58a51a7b824ac1a58d Mon Sep 17 00:00:00 2001 From: Eddy Varela Date: Tue, 2 May 2023 17:01:31 -0400 Subject: [PATCH 3/4] changing jest config --- jest.config.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jest.config.js b/jest.config.js index 94a6893a64d..60eadad754d 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,5 +1,4 @@ -module.exports = { - preset: 'ts-jest', +const config = { bail: false, verbose: true, testRunner: 'jest-circus/runner', @@ -49,3 +48,5 @@ module.exports = { // '/packages/amplify-velocity-template', // todo: enable after migration to Jest ], }; + +module.exports = config; From dcca90d02954b42afd95ce97fc0035225213bb02 Mon Sep 17 00:00:00 2001 From: Eddy Varela Date: Tue, 2 May 2023 17:25:22 -0400 Subject: [PATCH 4/4] chore: add babel --- package.json | 1 + pkg/babel.config.json | 3 ++- yarn.lock | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e9657b7cffb..5126fafa9ea 100644 --- a/package.json +++ b/package.json @@ -99,6 +99,7 @@ "@babel/plugin-proposal-numeric-separator": "^7.10.4", "@babel/plugin-transform-modules-commonjs": "7.10.4", "@babel/plugin-transform-typescript": "7.10.5", + "@babel/preset-typescript": "^7.21.5", "@commitlint/cli": "^17.6.1", "@commitlint/config-conventional": "^17.6.1", "@commitlint/config-lerna-scopes": "^17.4.2", diff --git a/pkg/babel.config.json b/pkg/babel.config.json index 5fdfa503944..06be95fabd0 100644 --- a/pkg/babel.config.json +++ b/pkg/babel.config.json @@ -6,7 +6,8 @@ "plugins": [ "@babel/plugin-transform-modules-commonjs", "@babel/plugin-transform-typescript", - "@babel/plugin-proposal-numeric-separator" + "@babel/plugin-proposal-numeric-separator", + "@babel/preset-typescript" ], "only": [ "**/amplify-category-analytics/**/*", diff --git a/yarn.lock b/yarn.lock index 2bf91994108..cdc41d8e1c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6797,7 +6797,7 @@ __metadata: languageName: node linkType: hard -"@babel/preset-typescript@npm:^7.16.0": +"@babel/preset-typescript@npm:^7.16.0, @babel/preset-typescript@npm:^7.21.5": version: 7.21.5 resolution: "@babel/preset-typescript@npm:7.21.5" dependencies: @@ -11587,6 +11587,7 @@ __metadata: "@babel/plugin-proposal-numeric-separator": ^7.10.4 "@babel/plugin-transform-modules-commonjs": 7.10.4 "@babel/plugin-transform-typescript": 7.10.5 + "@babel/preset-typescript": ^7.21.5 "@commitlint/cli": ^17.6.1 "@commitlint/config-conventional": ^17.6.1 "@commitlint/config-lerna-scopes": ^17.4.2