Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
* @aws-amplify/amplify-js
/packages/api @aws-amplify/amplify-js @aws-amplify/amplify-data
/packages/api-graphql @aws-amplify/amplify-data
/packages/api-rest @aws-amplify/amplify-js @aws-amplify/amplify-data
/packages/core @aws-amplify/amplify-js @aws-amplify/amplify-data
/packages/datastore @aws-amplify/amplify-data
/packages/datastore-storage-adapter @aws-amplify/amplify-data
/packages/api @aws-amplify/amplify-js
/packages/api-graphql @aws-amplify/amplify-js
/packages/api-rest @aws-amplify/amplify-js
/packages/core @aws-amplify/amplify-js
/packages/datastore @aws-amplify/amplify-js
/packages/datastore-storage-adapter @aws-amplify/amplify-js
/packages/geo @aws-amplify/amplify-js @aws-amplify/amplify-ui
/packages/pubsub @aws-amplify/amplify-js @aws-amplify/amplify-data
/packages/pubsub @aws-amplify/amplify-js
/packages/aws-amplify/package.json @aws-amplify/amplify-js-admins
/packages/storage/src/storageBrowser @aws-amplify/amplify-js @aws-amplify/amplify-ui
/packages/storage/storage-browser @aws-amplify/amplify-js @aws-amplify/amplify-ui
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ the requirements below.

#### Issue #, if available
<!-- Also, please reference any associated PRs for documentation updates. -->

<!-- For external contributions, provide the github issue the PR is addressing. If no github issue exists for the related changes, open a new issue in https://github.com/aws-amplify/amplify-js/issues. -->


#### Description of how you validated changes
Expand Down
19 changes: 18 additions & 1 deletion .github/workflows/callable-docs-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,22 @@ jobs:
run: |
yarn run docs:references

- name: Prepare docs temp branch
working-directory: ./docs
env:
TEMP_BRANCH_NAME: ${{ needs.docs-update-prep.outputs.branch_name }}
GITHUB_TOKEN: ${{ secrets.GH_TOKEN_AMPLIFY_JS_WRITE }}
run: |
# First sync pre-prod/main with main using the "theirs" strategy to resolve conflicts
git fetch origin main pre-prod/main
git checkout pre-prod/main
# Use -X theirs to automatically resolve conflicts in favor of main
git merge origin/main --no-edit -X theirs
git push origin pre-prod/main

# Now create a new branch from the updated pre-prod/main
git checkout -b $TEMP_BRANCH_NAME

- name: Update API references in the docs site
working-directory: ./docs
run: |
Expand All @@ -61,6 +77,7 @@ jobs:
TEMP_BRANCH_NAME: ${{ needs.docs-update-prep.outputs.branch_name }}
GITHUB_TOKEN: ${{ secrets.GH_TOKEN_AMPLIFY_JS_WRITE }}
run: |
git checkout -b $TEMP_BRANCH_NAME
git push origin $TEMP_BRANCH_NAME

# Create PR from the temp branch to pre-prod/main
gh pr create -B pre-prod/main -H $TEMP_BRANCH_NAME --title 'chore: amplify-js api references update' --body 'Merge the api references changes from the most recent release.'
12 changes: 6 additions & 6 deletions packages/analytics/kinesis-firehose/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "@aws-amplify/analytics/kinesis-firehose",
"main": "../dist/cjs/providers/kinesis-firehose/index.js",
"browser": "../dist/esm/providers/kinesis-firehose/index.mjs",
"module": "../dist/esm/providers/kinesis-firehose/index.mjs",
"react-native": "../src/providers/kinesis-firehose/index.ts",
"typings": "../dist/esm/providers/kinesis-firehose/index.d.ts"
"name": "@aws-amplify/analytics/kinesis-firehose",
"main": "../dist/cjs/providers/kinesis-firehose/index.js",
"browser": "../dist/esm/providers/kinesis-firehose/index.mjs",
"module": "../dist/esm/providers/kinesis-firehose/index.mjs",
"react-native": "../dist/cjs/providers/kinesis-firehose/index.js",
"typings": "../dist/esm/providers/kinesis-firehose/index.d.ts"
}
12 changes: 6 additions & 6 deletions packages/analytics/kinesis/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "@aws-amplify/analytics/kinesis",
"main": "../dist/cjs/providers/kinesis/index.js",
"browser": "../dist/esm/providers/kinesis/index.mjs",
"module": "../dist/esm/providers/kinesis/index.mjs",
"react-native": "../src/providers/kinesis/index.ts",
"typings": "../dist/esm/providers/kinesis/index.d.ts"
"name": "@aws-amplify/analytics/kinesis",
"main": "../dist/cjs/providers/kinesis/index.js",
"browser": "../dist/esm/providers/kinesis/index.mjs",
"module": "../dist/esm/providers/kinesis/index.mjs",
"react-native": "../dist/cjs/providers/kinesis/index.js",
"typings": "../dist/esm/providers/kinesis/index.d.ts"
}
12 changes: 6 additions & 6 deletions packages/analytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Analytics category of aws-amplify",
"main": "./dist/cjs/index.js",
"module": "./dist/esm/index.mjs",
"react-native": "./src/index.ts",
"react-native": "./dist/cjs/index.js",
"typings": "./dist/esm/index.d.ts",
"sideEffects": false,
"publishConfig": {
Expand Down Expand Up @@ -42,31 +42,31 @@
},
"exports": {
".": {
"react-native": "./src/index.ts",
"react-native": "./dist/cjs/index.js",
"types": "./dist/esm/index.d.ts",
"import": "./dist/esm/index.mjs",
"require": "./dist/cjs/index.js"
},
"./pinpoint": {
"react-native": "./src/providers/pinpoint/index.ts",
"react-native": "./dist/cjs/providers/pinpoint/index.js",
"types": "./dist/esm/providers/pinpoint/index.d.ts",
"import": "./dist/esm/providers/pinpoint/index.mjs",
"require": "./dist/cjs/providers/pinpoint/index.js"
},
"./kinesis": {
"react-native": "./src/providers/kinesis/index.ts",
"react-native": "./dist/cjs/providers/kinesis/index.js",
"types": "./dist/esm/providers/kinesis/index.d.ts",
"import": "./dist/esm/providers/kinesis/index.mjs",
"require": "./dist/cjs/providers/kinesis/index.js"
},
"./kinesis-firehose": {
"react-native": "./src/providers/kinesis-firehose/index.ts",
"react-native": "./dist/cjs/providers/kinesis-firehose/index.js",
"types": "./dist/esm/providers/kinesis-firehose/index.d.ts",
"import": "./dist/esm/providers/kinesis-firehose/index.mjs",
"require": "./dist/cjs/providers/kinesis-firehose/index.js"
},
"./personalize": {
"react-native": "./src/providers/personalize/index.ts",
"react-native": "./dist/cjs/providers/personalize/index.js",
"types": "./dist/esm/providers/personalize/index.d.ts",
"import": "./dist/esm/providers/personalize/index.mjs",
"require": "./dist/cjs/providers/personalize/index.js"
Expand Down
12 changes: 6 additions & 6 deletions packages/analytics/personalize/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "@aws-amplify/analytics/personalize",
"main": "../dist/cjs/providers/personalize/index.js",
"browser": "../dist/esm/providers/personalize/index.mjs",
"module": "../dist/esm/providers/personalize/index.mjs",
"react-native": "../src/providers/personalize/index.ts",
"typings": "../dist/esm/providers/personalize/index.d.ts"
"name": "@aws-amplify/analytics/personalize",
"main": "../dist/cjs/providers/personalize/index.js",
"browser": "../dist/esm/providers/personalize/index.mjs",
"module": "../dist/esm/providers/personalize/index.mjs",
"react-native": "../dist/cjs/providers/personalize/index.js",
"typings": "../dist/esm/providers/personalize/index.d.ts"
}
12 changes: 6 additions & 6 deletions packages/analytics/pinpoint/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "@aws-amplify/analytics/pinpoint",
"main": "../dist/cjs/providers/pinpoint/index.js",
"browser": "../dist/esm/providers/pinpoint/index.mjs",
"module": "../dist/esm/providers/pinpoint/index.mjs",
"react-native": "../src/providers/pinpoint/index.ts",
"typings": "../dist/esm/providers/pinpoint/index.d.ts"
"name": "@aws-amplify/analytics/pinpoint",
"main": "../dist/cjs/providers/pinpoint/index.js",
"browser": "../dist/esm/providers/pinpoint/index.mjs",
"module": "../dist/esm/providers/pinpoint/index.mjs",
"react-native": "../dist/cjs/providers/pinpoint/index.js",
"typings": "../dist/esm/providers/pinpoint/index.d.ts"
}
2 changes: 1 addition & 1 deletion packages/api-graphql/internals/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"types": "../dist/esm/internals/index.d.ts",
"main": "../dist/cjs/internals/index.js",
"module": "../dist/esm/internals/index.mjs",
"react-native": "../src/internals/index.ts",
"react-native": "../dist/cjs/internals/index.js",
"sideEffects": false
}
2 changes: 1 addition & 1 deletion packages/api-graphql/internals/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"types": "../../dist/esm/internals/server/index.d.ts",
"main": "../../dist/cjs/internals/server/index.js",
"module": "../../dist/esm/internals/server/index.mjs",
"react-native": "../../src/internals/server/index.ts",
"react-native": "../../dist/cjs/internals/server/index.js",
"sideEffects": false
}
8 changes: 4 additions & 4 deletions packages/api-graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "./dist/cjs/index.js",
"module": "./dist/esm/index.mjs",
"typings": "./dist/esm/index.d.ts",
"react-native": "./src/index.ts",
"react-native": "./dist/cjs/index.js",
"sideEffects": [
"./dist/cjs/GraphQLAPI.js",
"./dist/esm/GraphQLAPI.mjs"
Expand All @@ -30,19 +30,19 @@
},
"exports": {
".": {
"react-native": "./src/index.ts",
"react-native": "./dist/cjs/index.js",
"types": "./dist/esm/index.d.ts",
"import": "./dist/esm/index.mjs",
"require": "./dist/cjs/index.js"
},
"./internals": {
"react-native": "./src/internals/index.ts",
"react-native": "./dist/cjs/internals/index.js",
"types": "./dist/esm/internals/index.d.ts",
"import": "./dist/esm/internals/index.mjs",
"require": "./dist/cjs/internals/index.js"
},
"./internals/server": {
"react-native": "./src/internals/server/index.ts",
"react-native": "./dist/cjs/internals/server/index.js",
"types": "./dist/esm/internals/server/index.d.ts",
"import": "./dist/esm/internals/server/index.mjs",
"require": "./dist/cjs/internals/server/index.js"
Expand Down
2 changes: 1 addition & 1 deletion packages/api-rest/internals/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"types": "../dist/esm/internals/index.d.ts",
"main": "../dist/cjs/internals/index.js",
"module": "../dist/esm/internals/index.mjs",
"react-native": "../src/internals/index.ts",
"react-native": "../dist/cjs/internals/index.js",
"sideEffects": false
}
6 changes: 3 additions & 3 deletions packages/api-rest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"main": "./dist/cjs/index.js",
"module": "./dist/esm/index.mjs",
"typings": "./dist/esm/index.d.ts",
"react-native": "./src/index.ts",
"react-native": "./dist/cjs/index.js",
"publishConfig": {
"access": "public"
},
Expand All @@ -27,7 +27,7 @@
},
"exports": {
".": {
"react-native": "./src/index.ts",
"react-native": "./dist/cjs/index.js",
"types": "./dist/esm/index.d.ts",
"import": "./dist/esm/index.mjs",
"require": "./dist/cjs/index.js"
Expand All @@ -38,7 +38,7 @@
"require": "./dist/cjs/server.js"
},
"./internals": {
"react-native": "./src/internals/index.ts",
"react-native": "./dist/cjs/internals/index.js",
"types": "./dist/esm/internals/index.d.ts",
"import": "./dist/esm/internals/index.mjs",
"require": "./dist/cjs/internals/index.js"
Expand Down
2 changes: 1 addition & 1 deletion packages/api/internals/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"types": "../dist/esm/internals/index.d.ts",
"main": "../dist/cjs/internals/index.js",
"module": "../dist/esm/internals/index.mjs",
"react-native": "../src/internals/index.ts",
"react-native": "../dist/cjs/internals/index.js",
"sideEffects": false
}
6 changes: 3 additions & 3 deletions packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "./dist/cjs/index.js",
"module": "./dist/esm/index.mjs",
"typings": "./dist/esm/index.d.ts",
"react-native": "./src/index.ts",
"react-native": "./dist/cjs/index.js",
"sideEffects": [
"./dist/cjs/API.js",
"./dist/esm/API.mjs"
Expand All @@ -29,13 +29,13 @@
},
"exports": {
".": {
"react-native": "./src/index.ts",
"react-native": "./dist/cjs/index.js",
"types": "./dist/esm/index.d.ts",
"import": "./dist/esm/index.mjs",
"require": "./dist/cjs/index.js"
},
"./internals": {
"react-native": "./src/internals/index.ts",
"react-native": "./dist/cjs/internals/index.js",
"types": "./dist/esm/internals/index.d.ts",
"import": "./dist/esm/internals/index.mjs",
"require": "./dist/cjs/internals/index.js"
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/cognito/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@aws-amplify/auth/cognito",
"main": "../dist/cjs/providers/cognito/index.js",
"react-native": "../src/providers/cognito/index.ts",
"react-native": "../dist/cjs/providers/cognito/index.js",
"browser": "../dist/esm/providers/cognito/index.mjs",
"module": "../dist/esm/providers/cognito/index.mjs",
"typings": "../dist/esm/providers/cognito/index.d.ts"
Expand Down
6 changes: 3 additions & 3 deletions packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "./dist/cjs/index.js",
"module": "./dist/esm/index.mjs",
"typings": "./dist/esm/index.d.ts",
"react-native": "./src/index.ts",
"react-native": "./dist/cjs/index.js",
"sideEffects": [
"./dist/cjs/providers/cognito/apis/signInWithRedirect.js",
"./dist/esm/providers/cognito/apis/signInWithRedirect.mjs",
Expand Down Expand Up @@ -44,13 +44,13 @@
},
"exports": {
".": {
"react-native": "./src/index.ts",
"react-native": "./dist/cjs/index.js",
"types": "./dist/esm/index.d.ts",
"import": "./dist/esm/index.mjs",
"require": "./dist/cjs/index.js"
},
"./cognito": {
"react-native": "./src/providers/cognito/index.ts",
"react-native": "./dist/cjs/providers/cognito/index.js",
"types": "./dist/esm/providers/cognito/index.d.ts",
"import": "./dist/esm/providers/cognito/index.mjs",
"require": "./dist/cjs/providers/cognito/index.js"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "aws-amplify/analytics/kinesis-firehose",
"main": "../../dist/cjs/analytics/kinesis-firehose/index.js",
"react-native": "../../src/analytics/kinesis-firehose/index.ts",
"react-native": "../../dist/cjs/analytics/kinesis-firehose/index.js",
"browser": "../../dist/esm/analytics/kinesis-firehose/index.mjs",
"module": "../../dist/esm/analytics/kinesis-firehose/index.mjs",
"typings": "../../dist/esm/analytics/kinesis-firehose/index.d.ts"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-amplify/analytics/kinesis/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "aws-amplify/analytics/kinesis",
"main": "../../dist/cjs/analytics/kinesis/index.js",
"react-native": "../../src/analytics/kinesis/index.ts",
"react-native": "../../dist/cjs/analytics/kinesis/index.js",
"browser": "../../dist/esm/analytics/kinesis/index.mjs",
"module": "../../dist/esm/analytics/kinesis/index.mjs",
"typings": "../../dist/esm/analytics/kinesis/index.d.ts"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-amplify/analytics/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "aws-amplify/analytics",
"main": "../dist/cjs/analytics/index.js",
"react-native": "../src/analytics/index.ts",
"react-native": "../dist/cjs/analytics/index.js",
"browser": "../dist/esm/analytics/index.mjs",
"module": "../dist/esm/analytics/index.mjs",
"typings": "../dist/esm/analytics/index.d.ts"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-amplify/analytics/personalize/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "aws-amplify/analytics/personalize",
"main": "../../dist/cjs/analytics/personalize/index.js",
"react-native": "../../src/analytics/personalize/index.ts",
"react-native": "../../dist/cjs/analytics/personalize/index.js",
"browser": "../../dist/esm/analytics/personalize/index.mjs",
"module": "../../dist/esm/analytics/personalize/index.mjs",
"typings": "../../dist/esm/analytics/personalize/index.d.ts"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-amplify/analytics/pinpoint/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "aws-amplify/analytics/pinpoint",
"main": "../../dist/cjs/analytics/pinpoint/index.js",
"react-native": "../../src/analytics/pinpoint/index.ts",
"react-native": "../../dist/cjs/analytics/pinpoint/index.js",
"browser": "../../dist/esm/analytics/pinpoint/index.mjs",
"module": "../../dist/esm/analytics/pinpoint/index.mjs",
"typings": "../../dist/esm/analytics/pinpoint/index.d.ts"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-amplify/api/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "aws-amplify/api",
"main": "../dist/cjs/api/index.js",
"react-native": "../src/api/index.ts",
"react-native": "../dist/cjs/api/index.js",
"browser": "../dist/esm/api/index.mjs",
"module": "../dist/esm/api/index.mjs",
"typings": "../dist/esm/api/index.d.ts"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-amplify/auth/cognito/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "aws-amplify/auth/cognito",
"main": "../../dist/cjs/auth/cognito/index.js",
"react-native": "../../src/auth/cognito/index.ts",
"react-native": "../../dist/cjs/auth/cognito/index.js",
"browser": "../../dist/esm/auth/cognito/index.mjs",
"module": "../../dist/esm/auth/cognito/index.mjs",
"typings": "../../dist/esm/auth/cognito/index.d.ts"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-amplify/auth/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "aws-amplify/auth",
"main": "../dist/cjs/auth/index.js",
"react-native": "../src/auth/index.ts",
"react-native": "../dist/cjs/auth/index.js",
"browser": "../dist/esm/auth/index.mjs",
"module": "../dist/esm/auth/index.mjs",
"typings": "../dist/esm/auth/index.d.ts"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-amplify/data/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "aws-amplify/data",
"main": "../dist/cjs/api/index.js",
"react-native": "../src/api/index.ts",
"react-native": "../dist/cjs/api/index.js",
"browser": "../dist/esm/api/index.mjs",
"module": "../dist/esm/api/index.mjs",
"typings": "../dist/esm/api/index.d.ts"
Expand Down
Loading
Loading