Skip to content

Commit d37cbcf

Browse files
authored
release(required): Amplify JS release (#14402)
2 parents e02023e + 7d58598 commit d37cbcf

File tree

80 files changed

+1209
-1166
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1209
-1166
lines changed

.github/workflows/callable-docs-update.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,22 @@ jobs:
5858
git fetch origin main pre-prod/main
5959
git checkout pre-prod/main
6060
# Use -X theirs to automatically resolve conflicts in favor of main
61-
git merge origin/main --no-edit -X theirs
61+
git merge origin/main --no-edit -X theirs --allow-unrelated-histories
62+
echo "MERGE COMPLETE"
6263
git push origin pre-prod/main
6364
6465
# Now create a new branch from the updated pre-prod/main
6566
git checkout -b $TEMP_BRANCH_NAME
6667
67-
- name: Update API references in the docs site
68+
- name: Setup yarn berry and Update API references
6869
working-directory: ./docs
6970
run: |
70-
yarn clean-references -- -p amplify-js
71+
npm install -g corepack
72+
corepack enable
73+
yarn -v
74+
75+
# Update API references
76+
yarn && yarn clean-references -- -p amplify-js
7177
git add .
7278
git commit --allow-empty -m "chore: Update amplify-js API references"
7379

.github/workflows/push-integ-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ on:
1313
jobs:
1414
e2e:
1515
secrets: inherit
16-
uses: ./.github/workflows/callable-release-verification.yml
16+
uses: ./.github/workflows/callable-release-verification.yml

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
"@babel/preset-react": "^7.0.0",
8383
"@eslint/compat": "^1.2.0",
8484
"@lerna/legacy-package-management": "^8.2.1",
85+
"@rollup/plugin-commonjs": "^28.0.1",
8586
"@rollup/plugin-typescript": "^11.1.6",
8687
"@size-limit/dual-publish": "^8.1.0",
8788
"@size-limit/file": "^8.1.0",
@@ -125,7 +126,7 @@
125126
"typedoc": "0.25.8",
126127
"typedoc-plugin-extras": "^3.0.0",
127128
"typedoc-plugin-missing-exports": "^2.2.0",
128-
"typescript": "^4.6.0",
129+
"typescript": "^5.3.0",
129130
"typescript-coverage-report": "^0.6.4",
130131
"uuid-validate": "^0.0.3",
131132
"webpack": "^5.75.0",

packages/adapter-nextjs/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
"@types/react-dom": "^18.2.6",
1717
"aws-amplify": "6.14.4",
1818
"jest-fetch-mock": "3.0.3",
19-
"next": ">= 13.5.0 < 15.0.0",
20-
"typescript": "5.0.2"
19+
"next": ">= 13.5.0 < 15.0.0"
2120
},
2221
"publishConfig": {
2322
"access": "public"

packages/analytics/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@
105105
"devDependencies": {
106106
"@aws-amplify/core": "6.11.4",
107107
"@aws-amplify/react-native": "1.1.9",
108-
"@aws-sdk/types": "3.398.0",
109-
"typescript": "5.0.2"
108+
"@aws-sdk/types": "3.398.0"
110109
}
111110
}

packages/api-graphql/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,6 @@
7171
"url": "https://github.com/aws/aws-amplify/issues"
7272
},
7373
"homepage": "https://aws-amplify.github.io/",
74-
"devDependencies": {
75-
"@rollup/plugin-typescript": "11.1.5",
76-
"rollup": "^4.9.6",
77-
"typescript": "5.0.2"
78-
},
7974
"files": [
8075
"dist/cjs",
8176
"dist/esm",

packages/api-rest/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
"devDependencies": {
9090
"@aws-amplify/core": "6.11.4",
9191
"@aws-amplify/react-native": "1.1.9",
92-
"@aws-sdk/types": "3.387.0",
93-
"typescript": "5.0.2"
92+
"@aws-sdk/types": "3.387.0"
9493
}
9594
}

0 commit comments

Comments
 (0)