Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from aws-amplify:main #20

Merged
merged 17 commits into from
Oct 13, 2022
Merged

[pull] main from aws-amplify:main #20

merged 17 commits into from
Oct 13, 2022

Conversation

pull[bot]
Copy link

@pull pull bot commented Oct 13, 2022

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

MatrixFrog and others added 17 commits January 12, 2022 14:02
…o make it reusable. In this case, it was necessary to use it before the assignment of the cancellableToken variable
Bumps [commonmarker](https://github.com/gjtorikian/commonmarker) from
0.23.4 to 0.23.6.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/gjtorikian/commonmarker/releases">commonmarker's
releases</a>.</em></p>
<blockquote>
<h2>v0.23.6</h2>
<h2>What's Changed</h2>
<p>This release includes two updates from the upstream
<code>cmark-gfm</code> library, namely:</p>
<ul>
<li><a href="https://github.com/github/cmark-gfm/releases">DoS
vulnerability in autolink extension</a> per <a
href="https://github.com/github/cmark-gfm/security/advisories/GHSA-cgh3-p57x-9q7q">GHSA-cgh3-p57x-9q7q</a></li>
<li><a
href="https://github.com/github/cmark-gfm/releases/tag/0.29.0.gfm.5">Added
<code>xmpp:</code> and <code>mailto:</code> support to the autolink
extension</a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/gjtorikian/commonmarker/blob/main/CHANGELOG.md">commonmarker's
changelog</a>.</em></p>
<blockquote>
<h1>Changelog</h1>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/gjtorikian/commonmarker/commit/a8f8d76fbc8c92ddb2e539a06bd93c5f8326705e"><code>a8f8d76</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/gjtorikian/commonmarker/issues/190">#190</a>
from anticomputer/main</li>
<li><a
href="https://github.com/gjtorikian/commonmarker/commit/ac916346314aef3015a713f92f7b46a8c34e98ed"><code>ac91634</code></a>
:gem: release 0.23.6</li>
<li><a
href="https://github.com/gjtorikian/commonmarker/commit/777fd3054be0e0ba18f2fda18ccc7eeeee82db92"><code>777fd30</code></a>
Update cmark-upstream to <a
href="https://github.com/github/cmark-gfm/commit/9d57d8a23">https://github.com/github/cmark-gfm/commit/9d57d8a23</a>...</li>
<li><a
href="https://github.com/gjtorikian/commonmarker/commit/7aaeb37e9780e87a9e9fbdddfe1feba1c9f360f4"><code>7aaeb37</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/gjtorikian/commonmarker/issues/188">#188</a>
from stevenlaidlaw/update-to-0290gfm5</li>
<li><a
href="https://github.com/gjtorikian/commonmarker/commit/795e628a406ec67f169440ed3aa84ba9483e2700"><code>795e628</code></a>
Update cmark-upstream to <a
href="https://github.com/github/cmark-gfm/commit/0578e1e4f">https://github.com/github/cmark-gfm/commit/0578e1e4f</a>...</li>
<li><a
href="https://github.com/gjtorikian/commonmarker/commit/39d19d65300c5735efcc77b2a57b65c207c013e7"><code>39d19d6</code></a>
Update cmark-upstream to <a
href="https://github.com/github/cmark-gfm/commit/766f161ef">https://github.com/github/cmark-gfm/commit/766f161ef</a>...</li>
<li><a
href="https://github.com/gjtorikian/commonmarker/commit/63b7bf89ee1be857c5a5757d6ea678c5c759b8b9"><code>63b7bf8</code></a>
Update FUNDING.yml</li>
<li><a
href="https://github.com/gjtorikian/commonmarker/commit/558c7275b18a7ae16136c0fc55f444458dd8cc58"><code>558c727</code></a>
Bump to 0.23.5</li>
<li><a
href="https://github.com/gjtorikian/commonmarker/commit/41eee7265f501305834d80e3d045ed6c9df77de2"><code>41eee72</code></a>
lint</li>
<li><a
href="https://github.com/gjtorikian/commonmarker/commit/897e8ed07d04b902a5cc3c928852bafdab4468aa"><code>897e8ed</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/gjtorikian/commonmarker/issues/180">#180</a>
from lumaxis/main</li>
<li>Additional commits viewable in <a
href="https://github.com/gjtorikian/commonmarker/compare/v0.23.4...v0.23.6">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=commonmarker&package-manager=bundler&previous-version=0.23.4&new-version=0.23.6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the
default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as
the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as
the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the
default for future PRs for this repo and language

You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/aws-amplify/amplify-js/network/alerts).

</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tim Schmelter <schmelte@amazon.com>
<!--
Please make sure to read the Pull Request Guidelines:

https://github.com/aws-amplify/amplify-js/blob/main/CONTRIBUTING.md#pull-requests
-->

#### Description of changes
<!--
Thank you for your Pull Request! Please provide a description above and
review
the requirements below.
-->
Parameter `password` described in JSDoc did not appear in the function
signature. It needed to be `pw` as it was defined in the method itself.
This PR only adds the parameter names in the method comment.


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



#### Description of how you validated changes



#### Checklist
<!-- Remove items that do not apply. For completed items, change [ ] to
[x]. -->

- [x] PR description included
- [ ] `yarn test` passes
- [ ] Tests are [changed or
added](https://github.com/aws-amplify/amplify-js/blob/main/CONTRIBUTING.md#steps-towards-contributions)
- [x] Relevant documentation is changed or added (and PR referenced)

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.
#10409)

Hello. I've opened this pull request due to an issue we faced on our
project while using amplify, where the graphql class could not read the
getCancellableToken variable


![10⁄03⁄22_1](https://user-images.githubusercontent.com/93326804/193653054-118a2f35-54b4-4d65-a54c-2b735358e846.png)
 
We found out that this was happening because an instance was not being
created before calling the graphql method, once the verification if the
instance exists was happening after the assignment of the
cancellableToken variable.

#### Description of changes
To work around this, I put the if statement that verificates if an
instance was created into a method, in order to make it reusable. In
this case, it was necessary to use it before the assignment of the
cancellableToken variable.

#### Description of how you validated changes
[VScode debugger]
Code block behavior

![Screenshot from 2022-10-03
14-03-35](https://user-images.githubusercontent.com/93326804/193646883-b0d2e8b6-8784-4750-b961-b967abe66571.png)


- Before the implementation:


https://user-images.githubusercontent.com/93326804/193637213-7bb3c531-23e4-47a3-a715-8655a2eb0017.mp4

- After the implementation:


https://user-images.githubusercontent.com/93326804/193653243-4d8dcd9a-eae5-49a9-ac66-44df4692642b.mp4

#### Checklist
- [✓] PR description included
- [✓] `yarn test` passes
- [✓] Tests are [changed or
added](https://github.com/aws-amplify/amplify-js/blob/main/CONTRIBUTING.md#steps-towards-contributions)
- [ x ] Relevant documentation is changed or added (and PR referenced)

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.
#### Description of changes

Just trying to eliminate warnings about this repo being deprecated.
https://developer.android.com/studio/build/jcenter-migration

#### Description of how you validated changes

Brought this new version of build.gradle into my own project's
node_modules/amazon-cognito-identity-js folder and checked that it still
builds correctly.

#### Checklist

- [x] PR description included
- [x] `yarn test` passes

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.
@pull pull bot added the ⤵️ pull label Oct 13, 2022
@pull pull bot merged commit c222d22 into AllanZhengYP:main Oct 13, 2022
AllanZhengYP pushed a commit that referenced this pull request Aug 4, 2023
* feat: Actions for pr testing (#12)

* feat: Add working e2e example (#14)

* chore: Add configurable e2e tests to GH workflows (#15)

* feat(e2e): add integ test runner and test

* fix(e2e): retain existing workflows

* fix(e2e): remove old e2e example

---------

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: add e2e browser auth tests (#16)

* chore: add e2e browser auth tests

* chore: code cleanup

---------

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: add e2e browser predictions interactions tests (#17)

* chore: add e2e integ_react_predictions

* chore: add browser e2e interactions

---------

Co-authored-by: Sridhar <ashwsrir@amazon.com>
Co-authored-by: Aaron S <94858815+stocaaro@users.noreply.github.com>

* chore: limit PR concurrency (#19)

* chore: add build_type and enable retry (#18)

* prod & dev

* -n 3

* turn off fail-fast

---------

Co-authored-by: Aaron S <94858815+stocaaro@users.noreply.github.com>

* chore: add e2e browser datastore tests (#20)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: add e2e browser api,storage tests (#21)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: fix single browser provided in integ-config (#22)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: Run dev and prod on the same runner

* chore: Add detox testing (#26)

* Feat/GitHub actions/test ashwinkumar6 (#27)

* chore: Re-arrange integ test configurations and improve prebuild (#29)

* chore: Re-arrange integ test configurations and inprove preflight

* Fix is-preflight flag

* Change preflight to prebuild for consistencu

* Disable fast fail on unit tests

* feat: Change yaml load output pattern

* chore: fix e2e integ_datastore_auth_v2 test

* chore: disable playwright tests (#33)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: add google env variables for e2e datastore tests (#35)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: add support for uploading artifacts  (#34)

* chore: test upload artifacts

* chore: test uploading artifact

* chore: Detox fix and step cleanup

* chore: Increase detox time limit

* chore: Turn warn to ignore for upload artifact misses

* chore: Disable broken detox tests

* chore: Disable PN testing and remove datastore test not running in circle

* chore: e2e add configurable time_out and retry_count (#36)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: Increase deviceTracking timeout

* chore: add deploy workflow (#37)

* chore: add deploy workflow

* chore: gh actions publish code clean up

---------

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: Model full CI/CD flow - improve preid release (#38)

* fix: Cache on the single yarn.lock instead of all

* fix: Sync with main

* chore: Revert to relative path use (#40)

* chore: Revert to relative path use

* fix: Remove path from workflows

* chore: Add post-release merge to main

* chore: Remove orphaned workflow files

* chore: e2e add integ_auth_test_cypress_no_ui test (#39)

* chore: e2e add integ_auth_test_cypress_no_ui test

* chore: code cleanup

---------

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: change github name and email

* chore: update yarn.log

* chore: move additional e2e commented tests (#43)

* chore: move additional e2e commented tests

* chore: add required permissions to script file

---------

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: e2e keep test_name same as CCI (#45)

* chore: e2e keep test_name same as CCI
* chore: e2e re-arrange integ config
---------
Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: update actions typo

Co-authored-by: William Lee <43682783+wlee221@users.noreply.github.com>

* chore: update actions typo

Co-authored-by: William Lee <43682783+wlee221@users.noreply.github.com>

* chore: cleanup github_email and github_name (#46)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: cleanup load verdaccio action (#47)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: actions code cleanup (#48)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: Remove unused actions and use env vars instead of injection in run commands (#49)

* chore: add retention period and timeout for cache (#50)

* chore: add retention period and timeout for cache

* chore: code cleanup

---------

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: Chanke js token name

* chore: Filter preid content

* chore: Move file names around and consume env vars

* fix: Rest bundle size increase

* chore: Compactify on syntax

* chore: dynamically fetch the repo_owner_name (#52)

* chore: dynamically fetch the repo_owner_name

* chore: code cleanup

---------

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: Configure staging to use corresponding branch name

* chore: Naming and cleanup

* chore: Naming and dependency workflow improvements

* chore: Fix vars use for gh user/email

* chore: run e2e Rollup + DataStore test on just chrome (#54)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: Add preid protection (#57)

* chore: Only publish to npm from the aws-amplify org

* chore: add concurrency to push workflows (#56)

* chore: add concurrency to push workflows

* chore: code cleanup

---------

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: Prepare for merge to main

* chore: Fix circle build

* chore: Okay, this will fix circle!

* chore: Integrate license checking into pr check

* chore: Add github action static tests

* chore: Fix test command

* Update .github/actions/npm-publish/action.yml

Co-authored-by: Jim Blanchard <jim.l.blanchard@gmail.com>

* chore: Fix names and descriptions

---------

Co-authored-by: Ashwin Kumar <ashwinkumar2468@gmail.com>
Co-authored-by: Sridhar <ashwsrir@amazon.com>
Co-authored-by: Lucas Yingshyan Ku <99565133+yingku@users.noreply.github.com>
Co-authored-by: William Lee <43682783+wlee221@users.noreply.github.com>
Co-authored-by: Jim Blanchard <jim.l.blanchard@gmail.com>
AllanZhengYP pushed a commit that referenced this pull request Aug 9, 2023
* feat: Actions for pr testing (#12)

* feat: Add working e2e example (#14)

* chore: Add configurable e2e tests to GH workflows (#15)

* feat(e2e): add integ test runner and test

* fix(e2e): retain existing workflows

* fix(e2e): remove old e2e example

---------

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: add e2e browser auth tests (#16)

* chore: add e2e browser auth tests

* chore: code cleanup

---------

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: add e2e browser predictions interactions tests (#17)

* chore: add e2e integ_react_predictions

* chore: add browser e2e interactions

---------

Co-authored-by: Sridhar <ashwsrir@amazon.com>
Co-authored-by: Aaron S <94858815+stocaaro@users.noreply.github.com>

* chore: limit PR concurrency (#19)

* chore: add build_type and enable retry (#18)

* prod & dev

* -n 3

* turn off fail-fast

---------

Co-authored-by: Aaron S <94858815+stocaaro@users.noreply.github.com>

* chore: add e2e browser datastore tests (#20)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: add e2e browser api,storage tests (#21)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: fix single browser provided in integ-config (#22)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: Run dev and prod on the same runner

* chore: Add detox testing (#26)

* Feat/GitHub actions/test ashwinkumar6 (#27)

* chore: Re-arrange integ test configurations and improve prebuild (#29)

* chore: Re-arrange integ test configurations and inprove preflight

* Fix is-preflight flag

* Change preflight to prebuild for consistencu

* Disable fast fail on unit tests

* feat: Change yaml load output pattern

* chore: fix e2e integ_datastore_auth_v2 test

* chore: disable playwright tests (#33)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: add google env variables for e2e datastore tests (#35)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: add support for uploading artifacts  (#34)

* chore: test upload artifacts

* chore: test uploading artifact

* chore: Detox fix and step cleanup

* chore: Increase detox time limit

* chore: Turn warn to ignore for upload artifact misses

* chore: Disable broken detox tests

* chore: Disable PN testing and remove datastore test not running in circle

* chore: e2e add configurable time_out and retry_count (#36)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: Increase deviceTracking timeout

* chore: add deploy workflow (#37)

* chore: add deploy workflow

* chore: gh actions publish code clean up

---------

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: Model full CI/CD flow - improve preid release (#38)

* fix: Cache on the single yarn.lock instead of all

* fix: Sync with main

* chore: Revert to relative path use (#40)

* chore: Revert to relative path use

* fix: Remove path from workflows

* chore: Add post-release merge to main

* chore: Remove orphaned workflow files

* chore: e2e add integ_auth_test_cypress_no_ui test (#39)

* chore: e2e add integ_auth_test_cypress_no_ui test

* chore: code cleanup

---------

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: change github name and email

* chore: update yarn.log

* chore: move additional e2e commented tests (#43)

* chore: move additional e2e commented tests

* chore: add required permissions to script file

---------

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: e2e keep test_name same as CCI (#45)

* chore: e2e keep test_name same as CCI
* chore: e2e re-arrange integ config
---------
Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: update actions typo

Co-authored-by: William Lee <43682783+wlee221@users.noreply.github.com>

* chore: update actions typo

Co-authored-by: William Lee <43682783+wlee221@users.noreply.github.com>

* chore: cleanup github_email and github_name (#46)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: cleanup load verdaccio action (#47)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: actions code cleanup (#48)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: Remove unused actions and use env vars instead of injection in run commands (#49)

* chore: add retention period and timeout for cache (#50)

* chore: add retention period and timeout for cache

* chore: code cleanup

---------

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: Chanke js token name

* chore: Filter preid content

* chore: Move file names around and consume env vars

* fix: Rest bundle size increase

* chore: Compactify on syntax

* chore: dynamically fetch the repo_owner_name (#52)

* chore: dynamically fetch the repo_owner_name

* chore: code cleanup

---------

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: Configure staging to use corresponding branch name

* chore: Naming and cleanup

* chore: Naming and dependency workflow improvements

* chore: Fix vars use for gh user/email

* chore: run e2e Rollup + DataStore test on just chrome (#54)

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: Add preid protection (#57)

* chore: Only publish to npm from the aws-amplify org

* chore: add concurrency to push workflows (#56)

* chore: add concurrency to push workflows

* chore: code cleanup

---------

Co-authored-by: Sridhar <ashwsrir@amazon.com>

* chore: Prepare for merge to main

* chore: Fix circle build

* chore: Okay, this will fix circle!

* chore: Integrate license checking into pr check

* chore: Add github action static tests

* chore: Fix test command

* Update .github/actions/npm-publish/action.yml

Co-authored-by: Jim Blanchard <jim.l.blanchard@gmail.com>

* chore: Fix names and descriptions

---------

Co-authored-by: Ashwin Kumar <ashwinkumar2468@gmail.com>
Co-authored-by: Sridhar <ashwsrir@amazon.com>
Co-authored-by: Lucas Yingshyan Ku <99565133+yingku@users.noreply.github.com>
Co-authored-by: William Lee <43682783+wlee221@users.noreply.github.com>
Co-authored-by: Jim Blanchard <jim.l.blanchard@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants