Skip to content

Commit

Permalink
Merge branch 'main' into expo-sqlite-adapter-codesharing
Browse files Browse the repository at this point in the history
  • Loading branch information
chintannp committed Mar 16, 2022
2 parents 55c76e6 + 0de2768 commit 3b98401
Show file tree
Hide file tree
Showing 585 changed files with 274,001 additions and 28,390 deletions.
6 changes: 4 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ executors:

js-test-executor:
docker:
- image: cypress/included:8.7.0
- image: cypress/included:9.4.1
- image: verdaccio/verdaccio
auth:
username: $DOCKERHUB_USERNAME
Expand Down Expand Up @@ -1537,7 +1537,9 @@ workflows:
- build
filters:
<<: *releasable_branches
browser: chrome
matrix:
parameters:
<<: *test_browsers
- deploy:
filters:
<<: *releasable_branches
Expand Down
19 changes: 5 additions & 14 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,21 +128,12 @@ These tests are only necessary if you’re looking to contribute a Pull Request.
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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/api/assets/js/search.js

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions docs/api/classes/abstractconvertpredictionsprovider.html
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> _config</h3>
<aside class="tsd-sources">
<p>Inherited from <a href="abstractpredictionsprovider.html">AbstractPredictionsProvider</a>.<a href="abstractpredictionsprovider.html#_config">_config</a></p>
<ul>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/a047ce73/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L7">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:7</a></li>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/88fc68a01/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L7">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:7</a></li>
</ul>
</aside>
</section>
Expand All @@ -1018,7 +1018,7 @@ <h3>configure</h3>
<aside class="tsd-sources">
<p>Inherited from <a href="abstractpredictionsprovider.html">AbstractPredictionsProvider</a>.<a href="abstractpredictionsprovider.html#configure">configure</a></p>
<ul>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/a047ce73/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L9">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:9</a></li>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/88fc68a01/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L9">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:9</a></li>
</ul>
</aside>
<h4 class="tsd-parameters-title">Parameters</h4>
Expand All @@ -1041,7 +1041,7 @@ <h3>convert</h3>
<li class="tsd-description">
<aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/a047ce73/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L21">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:21</a></li>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/88fc68a01/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L21">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:21</a></li>
</ul>
</aside>
<h4 class="tsd-parameters-title">Parameters</h4>
Expand All @@ -1064,7 +1064,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> convert<wbr>Speech<
<li class="tsd-description">
<aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/a047ce73/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L48">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:48</a></li>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/88fc68a01/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L48">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:48</a></li>
</ul>
</aside>
<h4 class="tsd-parameters-title">Parameters</h4>
Expand All @@ -1087,7 +1087,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> convert<wbr>Text<wb
<li class="tsd-description">
<aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/a047ce73/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L42">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:42</a></li>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/88fc68a01/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L42">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:42</a></li>
</ul>
</aside>
<h4 class="tsd-parameters-title">Parameters</h4>
Expand All @@ -1111,7 +1111,7 @@ <h3>get<wbr>Category</h3>
<aside class="tsd-sources">
<p>Overrides <a href="abstractpredictionsprovider.html">AbstractPredictionsProvider</a>.<a href="abstractpredictionsprovider.html#getcategory">getCategory</a></p>
<ul>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/a047ce73/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L17">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:17</a></li>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/88fc68a01/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L17">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:17</a></li>
</ul>
</aside>
<h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">string</span></h4>
Expand All @@ -1129,7 +1129,7 @@ <h3><span class="tsd-flag ts-flagAbstract">Abstract</span> get<wbr>Provider<wbr>
<aside class="tsd-sources">
<p>Inherited from <a href="abstractpredictionsprovider.html">AbstractPredictionsProvider</a>.<a href="abstractpredictionsprovider.html#getprovidername">getProviderName</a></p>
<ul>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/a047ce73/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L15">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:15</a></li>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/88fc68a01/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L15">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:15</a></li>
</ul>
</aside>
<h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">string</span></h4>
Expand All @@ -1146,7 +1146,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> translate<wbr>Text<
<li class="tsd-description">
<aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/a047ce73/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L36">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:36</a></li>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/88fc68a01/packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts#L36">packages/predictions/src/types/Providers/AbstractConvertPredictionsProvider.ts:36</a></li>
</ul>
</aside>
<h4 class="tsd-parameters-title">Parameters</h4>
Expand Down
16 changes: 8 additions & 8 deletions docs/api/classes/abstractidentifypredictionsprovider.html
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> _config</h3>
<aside class="tsd-sources">
<p>Inherited from <a href="abstractpredictionsprovider.html">AbstractPredictionsProvider</a>.<a href="abstractpredictionsprovider.html#_config">_config</a></p>
<ul>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/a047ce73/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L7">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:7</a></li>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/88fc68a01/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L7">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:7</a></li>
</ul>
</aside>
</section>
Expand All @@ -1018,7 +1018,7 @@ <h3>configure</h3>
<aside class="tsd-sources">
<p>Inherited from <a href="abstractpredictionsprovider.html">AbstractPredictionsProvider</a>.<a href="abstractpredictionsprovider.html#configure">configure</a></p>
<ul>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/a047ce73/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L9">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:9</a></li>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/88fc68a01/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L9">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:9</a></li>
</ul>
</aside>
<h4 class="tsd-parameters-title">Parameters</h4>
Expand All @@ -1042,7 +1042,7 @@ <h3>get<wbr>Category</h3>
<aside class="tsd-sources">
<p>Overrides <a href="abstractpredictionsprovider.html">AbstractPredictionsProvider</a>.<a href="abstractpredictionsprovider.html#getcategory">getCategory</a></p>
<ul>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/a047ce73/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L17">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:17</a></li>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/88fc68a01/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L17">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:17</a></li>
</ul>
</aside>
<h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">string</span></h4>
Expand All @@ -1060,7 +1060,7 @@ <h3><span class="tsd-flag ts-flagAbstract">Abstract</span> get<wbr>Provider<wbr>
<aside class="tsd-sources">
<p>Inherited from <a href="abstractpredictionsprovider.html">AbstractPredictionsProvider</a>.<a href="abstractpredictionsprovider.html#getprovidername">getProviderName</a></p>
<ul>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/a047ce73/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L15">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:15</a></li>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/88fc68a01/packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts#L15">packages/predictions/src/types/Providers/AbstractPredictionsProvider.ts:15</a></li>
</ul>
</aside>
<h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">string</span></h4>
Expand All @@ -1077,7 +1077,7 @@ <h3>identify</h3>
<li class="tsd-description">
<aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/a047ce73/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L21">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:21</a></li>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/88fc68a01/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L21">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:21</a></li>
</ul>
</aside>
<h4 class="tsd-parameters-title">Parameters</h4>
Expand All @@ -1100,7 +1100,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> identify<wbr>Entiti
<li class="tsd-description">
<aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/a047ce73/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L50">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:50</a></li>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/88fc68a01/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L50">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:50</a></li>
</ul>
</aside>
<h4 class="tsd-parameters-title">Parameters</h4>
Expand All @@ -1123,7 +1123,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> identify<wbr>Labels
<li class="tsd-description">
<aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/a047ce73/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L44">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:44</a></li>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/88fc68a01/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L44">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:44</a></li>
</ul>
</aside>
<h4 class="tsd-parameters-title">Parameters</h4>
Expand All @@ -1146,7 +1146,7 @@ <h3><span class="tsd-flag ts-flagProtected">Protected</span> identify<wbr>Text</
<li class="tsd-description">
<aside class="tsd-sources">
<ul>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/a047ce73/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L38">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:38</a></li>
<li>Defined in <a href="https://github.com/aws-amplify/amplify-js/blob/88fc68a01/packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts#L38">packages/predictions/src/types/Providers/AbstractIdentifyPredictionsProvider.ts:38</a></li>
</ul>
</aside>
<h4 class="tsd-parameters-title">Parameters</h4>
Expand Down
Loading

0 comments on commit 3b98401

Please sign in to comment.