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

Merge main into next-release/main #7454

Merged
merged 152 commits into from
May 2, 2024
Merged

Conversation

timngyn
Copy link
Member

@timngyn timngyn commented May 2, 2024

Description of changes:

Includes these PRs:

Related GitHub issue #, if available:

Instructions

If this PR should not be merged upon approval for any reason, please submit as a DRAFT

Which product(s) are affected by this PR (if applicable)?

  • amplify-cli
  • amplify-ui
  • amplify-studio
  • amplify-hosting
  • amplify-libraries

Which platform(s) are affected by this PR (if applicable)?

  • JS
  • Swift
  • Android
  • Flutter
  • React Native

Please add the product(s)/platform(s) affected to the PR title

Checks

  • Does this PR conform to the styleguide?

  • Does this PR include filetypes other than markdown or images? Please add or update unit tests accordingly.

  • Are any files being deleted with this PR? If so, have the needed redirects been created?

  • Are all links in MDX files using the MDX link syntax rather than HTML link syntax?

    ref: MDX: [link](https://docs.amplify.aws/)
    HTML: <a href="https://docs.amplify.aws/">link</a>

When this PR is ready to merge, please check the box below

  • Ready to merge

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

hibler13 and others added 30 commits February 19, 2024 13:21
* Updates to Vite + React quickstart

* Update src/fragments/gen2/quickstart/build-a-backend.mdx

Co-authored-by: Kevin Old <kevold@amazon.com>

* Update build-a-backend.mdx

* Update build-a-backend.mdx

* Update build-a-backend.mdx

---------

Co-authored-by: Kevin Old <kevold@amazon.com>
* platform typed as optional

* refactor init

* remove commented code

* remove angry useEffect

* fix typing

* added layoutcontext so mobile menu closes on navigation

* move import

---------

Co-authored-by: katiegoines <katiegoines@gmail.com>
…atform (#6947)

Co-authored-by: Tim Nguyen <54393192+timngyn@users.noreply.github.com>
* chore: more layout refactoring

* remove unused prop, alphabetize props
* include usage for multi-page apps

* improve multi-page app docs

* use Hub syntax

* update imports in examples
* chore: Clean up broken Amplify JS API reference links.

* Cleaned up language.
* update build image settings for Gen 2

* remove callout and add fragment to vite guide
* chore: add unit test for YoutubeEmbed component

* add code coverage stats

---------

Co-authored-by: katiegoines <katiegoines@gmail.com>
* chore: add unit tests for Accordion component

* issue with window properties

* fixed tracking test

* working on animation issue

* accordion tests

* fix testing errors

* added test for closing accordion

* add code coverage stats

---------

Co-authored-by: katiegoines <katiegoines@gmail.com>
* Add algolia env vars to next.config

* Remove extra code string
…; add build step to docs (#6970)

* fix(data): update React Native minimum iOS deployment target; add build step to docs

* address PR feedback

* remove deployment target guidance

* add React Native version deployment target callout

* fix unrecognized syntax

* replace callout with accordion

* move 'upgrading' callout
* Clarify behavior of forgetDevice() API regarding device tracking

This commit updates the documentation to clarify that using the forgetDevice() API results in the device being neither remembered nor tracked. Previously, the documentation suggested that forgotten devices might still be tracked, leading to confusion about the API's behavior. The revised wording aligns with the detailed description under the "Forgotten" section, ensuring consistency and eliminating ambiguity about how forgotten devices are handled.

* Clarify behavior of forgetDevice() API regarding device tracking
* Support for enum value listing

* Update src/pages/gen2/build-a-backend/data/data-modeling/add-fields/index.mdx
reesscot
reesscot previously approved these changes May 2, 2024
reesscot
reesscot previously approved these changes May 2, 2024
@@ -225,7 +225,7 @@ npx ampx generate outputs --stack amplify-nextamplifygen2-josef-sandbox-ca85e108

#### Use with mobile applications

Similar to `sandbox`, you can specify an alternate configuration file format by using `--format`:
Similar to `sandbox`, you can specify an alternate outputs file format by using `--format`:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file only had this change from this PR: https://github.com/aws-amplify/docs/pull/7346/files#diff-61d6c0f99c1aa1d1c1e497cfcfc20a3ae905ccd606de326c7f416eeacf467977

The other lines were removed from next-release/main, but not main


To connect your frontend code to your backend, you need to:

1. configure the Amplify library with the Amplify client configuration file
1. configure the Amplify library with the Amplify client configuration file (`amplify_outputs.json`)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like elsewhere “configuration file” is replaced with “output file”. Should it be here as well?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it probably should, but I didn't want to add things manually for this merge

@@ -92,7 +92,7 @@ npx ampx sandbox

</InlineFilter>

After a successful deployment, this command also generates a configuration file (`amplify_outputs.json`) to enable your frontend app to connect to your backend resources. The values you configure in your backend authentication resource are set in the generated configuration file to automatically configure the frontend [`Authenticator connected component`](https://ui.docs.amplify.aws/react/connected-components/authenticator).
After a successful deployment, this command also generates an outputs file (`amplify_outputs.json`) to enable your frontend app to connect to your backend resources. The values you configure in your backend authentication resource are set in the generated outputs file to automatically configure the frontend [`Authenticator connected component`](https://ui.docs.amplify.aws/react/connected-components/authenticator).
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file only had this change from this PR: https://github.com/aws-amplify/docs/pull/7346/files#diff-924b0ebe58c5ed1d9c88ae288ee395e72f9b259b2f3a93651f0462eab818b0bc

I think the other lines were already updated on next-release/main

katiegoines
katiegoines previously approved these changes May 2, 2024
@timngyn timngyn enabled auto-merge (squash) May 2, 2024 18:35
@timngyn timngyn merged commit d070fc2 into next-release/main May 2, 2024
5 checks passed
@timngyn timngyn deleted the merge-main-next-release branch May 2, 2024 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.