Skip to content

Commit 833d044

Browse files
authored
Merge pull request #344 from aws-amplify/master
Reverting release that seems to have broken studio
2 parents e082b0b + 694856a commit 833d044

File tree

7 files changed

+64
-60
lines changed

7 files changed

+64
-60
lines changed

.circleci/config.base.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ executors:
1818
shell: bash.exe
1919
macos_node12: &macos_node12
2020
macos:
21-
xcode: "11.2.1"
21+
xcode: 13.2.1
2222
resource_class: large
2323

2424
defaults: &defaults
@@ -80,6 +80,8 @@ jobs:
8080
- equal: [ *windows_node12, << parameters.os >> ]
8181
steps:
8282
- checkout
83+
- run: nvm install 12.22.7
84+
- run: nvm alias default 12.22.7
8385
- run: yarn config set workspaces-experimental true
8486
- run: yarn cache clean --force
8587
- run: yarn run production-build

.circleci/config.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ executors:
1919
shell: bash.exe
2020
macos_node12: &ref_1
2121
macos:
22-
xcode: 11.2.1
22+
xcode: 13.2.1
2323
resource_class: large
2424
defaults:
2525
working_directory: ~/repo
@@ -82,6 +82,8 @@ jobs:
8282
- << parameters.os >>
8383
steps:
8484
- checkout
85+
- run: nvm install 12.22.7
86+
- run: nvm alias default 12.22.7
8587
- run: yarn config set workspaces-experimental true
8688
- run: yarn cache clean --force
8789
- run: yarn run production-build

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
"packages/*"
5959
],
6060
"devDependencies": {
61-
"@commitlint/cli": "^15.0.0",
62-
"@commitlint/config-conventional": "^15.0.0",
63-
"@commitlint/config-lerna-scopes": "^15.0.0",
61+
"@commitlint/cli": "^8.1.0",
62+
"@commitlint/config-conventional": "^8.1.0",
63+
"@commitlint/config-lerna-scopes": "^8.1.0",
6464
"@types/jest": "^25.2.1",
6565
"@types/js-yaml": "^3.12.3",
6666
"@typescript-eslint/eslint-plugin": "^2.16.0",

packages/amplify-codegen-e2e-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
"dependencies": {
2525
"amplify-codegen-e2e-core": "1.1.5",
26-
"aws-amplify": "^4.3.10",
26+
"aws-amplify": "^3.0.8",
2727
"aws-appsync": "^4.0.3",
2828
"aws-sdk": "^2.845.0",
2929
"circleci-api": "^4.1.3",

packages/amplify-codegen/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@aws-amplify/appsync-modelgen-plugin": "1.29.11",
2424
"@aws-amplify/graphql-docs-generator": "2.4.2",
2525
"@aws-amplify/graphql-types-generator": "2.8.6",
26-
"@graphql-codegen/core": "2.3.0",
26+
"@graphql-codegen/core": "1.8.3",
2727
"amplify-codegen-appsync-model-plugin": "^1.22.3",
2828
"amplify-graphql-docs-generator": "^2.2.1",
2929
"amplify-graphql-types-generator": "^2.7.0",

packages/appsync-modelgen-plugin/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
"test": "jest"
2525
},
2626
"dependencies": {
27-
"@graphql-codegen/plugin-helpers": "^2.3.1",
28-
"@graphql-codegen/visitor-plugin-common": "^2.5.1",
29-
"@graphql-tools/utils": "^8.5.3",
27+
"@graphql-codegen/plugin-helpers": "^1.12.2",
28+
"@graphql-codegen/visitor-plugin-common": "1.12.2",
29+
"@graphql-tools/utils": "^6.0.18",
3030
"@types/node": "^12.12.6",
3131
"@types/pluralize": "0.0.29",
3232
"chalk": "^3.0.0",
@@ -38,9 +38,9 @@
3838
"ts-dedent": "^1.1.0"
3939
},
4040
"devDependencies": {
41-
"@graphql-codegen/testing": "^1.17.7",
41+
"@graphql-codegen/testing": "^1.13.1",
4242
"graphql": "^14.5.8",
43-
"java-ast": "^0.3.0"
43+
"java-ast": "^0.1.0"
4444
},
4545
"peerDependencies": {
4646
"graphql": "^14.5.8"

0 commit comments

Comments
 (0)