Merge branch 'main' into jcenter-build-warning

.envrc

@@ -0,0 +1 @@
+use node 14

.github/CODEOWNERS

@@ -1,10 +1,21 @@
-/packages/auth @elorzafe
-/packages/analytics @iartemiev
-/packages/pubsub @manueliglesias
-/packages/xr @jordanranz
-/packages/amplify-ui @jordanranz
-/packages/aws-amplify-react-native @Ashish-Nanda
-/packages/pushnotification @Ashish-Nanda
-/packages/datastore @manueliglesias
-/.github/ @sammartinez
-/.circleci/ @iartemiev
+* @aws-amplify/amplify-js
+/packages/amplify-ui @aws-amplify/amplify-js @aws-amplify/amplify-ui
+/packages/amplify-ui-angular @aws-amplify/amplify-js @aws-amplify/amplify-ui
+/packages/amplify-ui-components  @aws-amplify/amplify-js @aws-amplify/amplify-ui
+/packages/amplify-ui-react  @aws-amplify/amplify-js @aws-amplify/amplify-ui
+/packages/amplify-ui-storybook  @aws-amplify/amplify-js @aws-amplify/amplify-ui
+/packages/amplify-ui-vue  @aws-amplify/amplify-js @aws-amplify/amplify-ui
+/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/aws-amplify-angular @aws-amplify/amplify-js @aws-amplify/amplify-ui
+/packages/aws-amplify-react @aws-amplify/amplify-js @aws-amplify/amplify-ui
+/packages/aws-amplify-react-native @aws-amplify/amplify-js @aws-amplify/amplify-ui
+/packages/aws-amplify-vue @aws-amplify/amplify-js @aws-amplify/amplify-ui
+/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/geo @aws-amplify/amplify-js @aws-amplify/amplify-ui
+/packages/pubsub @aws-amplify/amplify-js @aws-amplify/amplify-data
+/.circleci/ @aws-amplify/amplify-js @aws-amplify/amplify-devops
+/.github/ @aws-amplify/amplify-js-admins

.github/ISSUE_TEMPLATE/2.feature_request.yaml

@@ -40,6 +40,7 @@ body:
         - Internationalization
         - Cache
         - Predictions
+        - Geo
         - New API
 
   - type: input

.github/actions/bundle-size-action/angular/package.json

@@ -48,7 +48,7 @@
     "codelyzer": "^6.0.0",
     "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~6.1.0",
+    "karma": "~6.3.14",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage": "~2.0.3",
     "karma-jasmine": "~4.0.0",

.github/actions/bundle-size-action/next/package.json

@@ -34,9 +34,9 @@
 	"dependencies": {
 		"@next/bundle-analyzer": "^10.0.7",
 		"aws-amplify": "unstable",
-		"next": "10.0.5",
-		"react": "17.0.1",
-		"react-dom": "17.0.1"
+		"next": "^12.1.0",
+		"react": "^17.0.2",
+		"react-dom": "^17.0.2"
 	},
 	"devDependencies": {
 		"bundlewatch": "^0.3.1",

.vscode/launch.json

@@ -0,0 +1,28 @@
+// A launch configuration that compiles the extension and then opens it inside a new window
+// Use IntelliSense to learn about possible attributes.
+// Hover to view descriptions of existing attributes.
+// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+{
+	"version": "0.2.0",
+    "configurations": [
+        {
+			"name": "debug tests",
+			"type": "node",
+			"request": "launch",
+			// The debugger will only run tests for the package specified here:
+			"cwd": "${workspaceFolder}/packages/datastore",
+			"runtimeArgs": [
+				"--inspect-brk",
+				"${workspaceRoot}/node_modules/.bin/jest",
+				// Optionally specify a single test file to run/debug:
+				"storage.test.ts",
+				"--runInBand",
+				"--testTimeout",
+				"600000", // 10 min timeout so jest doesn't error while we're stepping through code
+				"false"
+			],
+			"console": "integratedTerminal",
+			"internalConsoleOptions": "neverOpen"
+		}
+    ]
+}

CONTRIBUTING.md

@@ -120,35 +120,26 @@ In your sample project, you can now link specific packages
 yarn link @aws-amplify/auth
 ```
 
-These tests are only necessary if you’re looking to contribute a Pull Request. If you’re just playing locally you don’t need them. However if you’re contributing a Pull Request for anything other than bug fixes it would be best to validate that first because depending on the scope of the change.
+Passing unit tests are only necessary if you’re looking to contribute a pull request. If you’re just playing locally, you don’t need them. However, if you’re contributing a pull request for anything other than making a change to the documentation, fixing a formatting issue in the code (i.e., white space, missing semi-colons) or another task that does not impact the functionality of the code, you will need to validate your proposed changes with passing unit tests.
 
 **Using the setup-dev:react-native script to work with React-Native apps**
 
 > Note: All the below commands to be run from the local amplify-js library root
 
 To develop locally alongside a React-Native app, make sure to,
 
-1. Finish the build steps mentioned in the section: `Setting up for local development`
+1. Finish the build steps mentioned in the section: `Setting up for local development` to set up your local `amplify-js` repository for development.
 
-2. Install the dev dependency package : `wml`
+   > Note: To set up a sample React-Native app -- configure your [development environment](https://reactnative.dev/docs/environment-setup) and [create an app](https://reactnative.dev/docs/environment-setup#creating-a-new-application). Note the path to the app as it is required in the next step.
 
-```
-npm install wml --save-dev
-```
-
-3. Add the wml src folder to watchman.
-
-```
-watchman watch node_modules/wml/src
-```
-
-4. Run the below command in the root of the amplify-js local repository with a package name (auth for example):
+2. Run the below command in the root of the amplify-js local repository with a package name (auth for example):
+   > Make sure to have [watchman](https://facebook.github.io/watchman/docs/install.html) installed before running the command below
 
 ```
 npm run setup-dev:react-native -- --packages @aws-amplify/auth --target ~/path/to/your/rn/app/root
 ```
 
-> Note: This script runs a continious job in the newly opened tabs to watch, build and copy the changes unlike the usual linking method.
+> Note: This script runs a continuous job in the newly opened tabs to watch, build and copy the changes unlike the usual linking method.
 
 The options `--packages` is used to specify single or multiple package names and the `--target` option is used to specify the path to your sample React-Native app.
 Optionally, you can use the shorthands flags `-p` and `-t` for packages and target path respectively.
@@ -166,7 +157,7 @@ npm run setup-dev:react-native -- --all --target ~/path/to/your/rn/app/root
 
 **Debugging problems with the `setup-dev:react-native` script**
 
-- If the WML command does not do anything after adding the links, watch it's src file using watchman. run the below from the root of this repository:
+- If the WML command does not do anything after adding the links, watch its src file using watchman. Run the below from the root of this repository:
 
   ```
   watchman watch node_modules/wml/src

README.md

@@ -128,3 +128,7 @@ If you can't migrate to [aws-sdk-js-v3](https://github.com/aws/aws-sdk-js-v3) or
   ```js
   import { Auth } from 'aws-amplify';
   ```
+
+### DataStore Docs
+
+For more information on contributing to DataStore / how DataStore works, see the [DataStore Docs](packages/datastore/README.md)