resolve conflicts

ashwinkumar6 · Apr 24, 2024 · 10f1d52 · 10f1d52
2 parents 990f451 + 3f07b11
commit 10f1d52
Show file tree

Hide file tree

Showing 136 changed files with 1,014 additions and 3,877 deletions.
diff --git a/.github/workflows/aws-amplify-dependency-check.yml b/.github/workflows/aws-amplify-dependency-check.yml
@@ -27,13 +27,11 @@ jobs:
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: `⚠️ This PR includes manual changes to the "aws-amplify" package.json file, which can have library-wide implications. 
+              body: `⚠️ This PR includes changes to the "aws-amplify" package.json file, which can have library-wide implications. 
 
               Please ensure that this PR:
-              - Does not modify "@aws-amplify/*" dependency versions, which may misalign core dependencies across the library.
-              
-              A repository administrator **is required** to review & merge this change.`
+              - Does not manually change "@aws-amplify/*" dependency versions, which may misalign core dependencies across the library
+              - Remove any export paths without a major version bump
+
+              A repository administrator **is required** to review this change.`
             })
-      - name: Fail status check
-        if: steps.aws-amplify-package-check.outputs.any_changed == 'true'
-        run: exit 1
diff --git a/docs/api/assets/navigation.js b/docs/api/assets/navigation.js
diff --git a/docs/api/assets/search.js b/docs/api/assets/search.js
diff --git a/docs/api/classes/_aws_amplify_adapter_nextjs.api._Reference_Types_.AmplifyClass.html b/docs/api/classes/_aws_amplify_adapter_nextjs.api._Reference_Types_.AmplifyClass.html
diff --git a/docs/api/classes/_aws_amplify_adapter_nextjs.api._Reference_Types_.AuthClass.html b/docs/api/classes/_aws_amplify_adapter_nextjs.api._Reference_Types_.AuthClass.html
diff --git a/...pi/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.AWSAuthSignInDetails.html b/...pi/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.AWSAuthSignInDetails.html
diff --git a/docs/api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.AWSCredentials.html b/docs/api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.AWSCredentials.html
diff --git a/docs/api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.AuthSession.html b/docs/api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.AuthSession.html
diff --git a/docs/api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.AuthTokens.html b/docs/api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.AuthTokens.html
diff --git a/...nterfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.CredentialsAndIdentityId.html b/...nterfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.CredentialsAndIdentityId.html
diff --git a/...s/_aws_amplify_adapter_nextjs.api._Reference_Types_.CredentialsAndIdentityIdProvider.html b/...s/_aws_amplify_adapter_nextjs.api._Reference_Types_.CredentialsAndIdentityIdProvider.html
diff --git a/...interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.FetchAuthSessionOptions.html b/...interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.FetchAuthSessionOptions.html
diff --git a/...es/_aws_amplify_adapter_nextjs.api._Reference_Types_.GetCredentialsAuthenticatedUser.html b/...es/_aws_amplify_adapter_nextjs.api._Reference_Types_.GetCredentialsAuthenticatedUser.html
diff --git a/.../_aws_amplify_adapter_nextjs.api._Reference_Types_.GetCredentialsUnauthenticatedUser.html b/.../_aws_amplify_adapter_nextjs.api._Reference_Types_.GetCredentialsUnauthenticatedUser.html
diff --git a/docs/api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.JWT.html b/docs/api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.JWT.html
diff --git a/docs/api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.JsonObject.html b/docs/api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.JsonObject.html
diff --git a/...nterfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.JwtPayloadStandardFields.html b/...nterfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.JwtPayloadStandardFields.html
diff --git a/docs/api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.LibraryAPIOptions.html b/docs/api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.LibraryAPIOptions.html
diff --git a/.../api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.LibraryAuthOptions.html b/.../api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.LibraryAuthOptions.html
diff --git a/docs/api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.LibraryOptions.html b/docs/api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.LibraryOptions.html
diff --git a/...i/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.LibraryStorageOptions.html b/...i/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.LibraryStorageOptions.html
diff --git a/docs/api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.TokenProvider.html b/docs/api/interfaces/_aws_amplify_adapter_nextjs.api._Reference_Types_.TokenProvider.html
diff --git a/docs/api/interfaces/_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieListItem.html b/docs/api/interfaces/_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieListItem.html
diff --git a/...nterfaces/_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html b/...nterfaces/_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html><html class="default" lang="en"><head><meta charSet="utf-8"/><meta http-equiv="x-ua-compatible" content="IE=edge"/><title>CookieSerializeOptions | Amplify JS API Documentation</title><meta name="description" content="Documentation for Amplify JS API Documentation"/><meta name="viewport" content="width=device-width, initial-scale=1"/><link rel="stylesheet" href="../assets/style.css"/><link rel="stylesheet" href="../assets/highlight.css"/><link rel="stylesheet" href="../assets/custom.css"/><script defer src="../assets/main.js"></script><script async src="../assets/search.js" id="tsd-search-script"></script><script async src="../assets/navigation.js" id="tsd-nav-script"></script><link rel="icon" href="../favicon.ico" />
 </head><body><script>document.documentElement.dataset.theme = localStorage.getItem("tsd-theme") || "os"</script><header class="tsd-page-toolbar"><div class="tsd-toolbar-contents container"><div class="table-cell" id="tsd-search" data-base=".."><div class="field"><label for="tsd-search-field" class="tsd-widget tsd-toolbar-icon search no-caption"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><use href="#icon-search"></use></svg></label><input type="text" id="tsd-search-field" aria-label="Search"/></div><div class="field"><div id="tsd-toolbar-links"><a href="https://docs.amplify.aws/">Library Documentation</a><a href="https://www.npmjs.com/package/aws-amplify">NPM</a><a href="https://github.com/aws-amplify/amplify-js">GitHub</a></div></div><ul class="results"><li class="state loading">Preparing search index...</li><li class="state failure">The search index is not available</li></ul><a href="../index.html" class="title">Amplify JS API Documentation</a></div><div class="table-cell" id="tsd-widgets"><a href="#" class="tsd-widget tsd-toolbar-icon menu no-caption" data-toggle="menu" aria-label="Menu"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><use href="#icon-menu"></use></svg></a></div></div></header><div class="container container-main"><div class="col-content"><div class="tsd-page-title"><ul class="tsd-breadcrumb"><li><a href="../index.html">Amplify JS API Documentation</a></li><li><a href="../modules/_aws_amplify_adapter_nextjs.html">@aws-amplify/adapter-nextjs</a></li><li><a href="../modules/_aws_amplify_adapter_nextjs.index.html">index</a></li><li><a href="../modules/_aws_amplify_adapter_nextjs.index._Reference_Types_.html">&lt;Reference Types&gt;</a></li><li><a href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html">CookieSerializeOptions</a></li></ul><h1>Interface CookieSerializeOptions</h1></div><section class="tsd-panel tsd-comment"><div class="tsd-comment tsd-typography"><p>Additional serialization options</p>
-</div><div class="tsd-comment tsd-typography"></div></section><div class="tsd-signature"><span class="tsd-signature-keyword">interface </span><span class="tsd-kind-interface">CookieSerializeOptions</span> <span class="tsd-signature-symbol">{ </span><br/><span>    </span><a class="tsd-kind-property" href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#domain">domain</a><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">; </span><br/><span>    </span><a class="tsd-kind-property" href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#expires">expires</a><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">Date</span><span class="tsd-signature-symbol">; </span><br/><span>    </span><a class="tsd-kind-property" href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#httpOnly">httpOnly</a><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">boolean</span><span class="tsd-signature-symbol">; </span><br/><span>    </span><a class="tsd-kind-property" href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#maxAge">maxAge</a><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">number</span><span class="tsd-signature-symbol">; </span><br/><span>    </span><a class="tsd-kind-property" href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#path">path</a><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">; </span><br/><span>    </span><a class="tsd-kind-property" href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#priority">priority</a><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">&quot;low&quot;</span><span class="tsd-signature-symbol"> | </span><span class="tsd-signature-type">&quot;medium&quot;</span><span class="tsd-signature-symbol"> | </span><span class="tsd-signature-type">&quot;high&quot;</span><span class="tsd-signature-symbol">; </span><br/><span>    </span><a class="tsd-kind-property" href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#sameSite">sameSite</a><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">boolean</span><span class="tsd-signature-symbol"> | </span><span class="tsd-signature-type">&quot;none&quot;</span><span class="tsd-signature-symbol"> | </span><span class="tsd-signature-type">&quot;lax&quot;</span><span class="tsd-signature-symbol"> | </span><span class="tsd-signature-type">&quot;strict&quot;</span><span class="tsd-signature-symbol">; </span><br/><span>    </span><a class="tsd-kind-property" href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#secure">secure</a><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">boolean</span><span class="tsd-signature-symbol">; </span><br/><span>    </span><a class="tsd-kind-call-signature" href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#encode.encode-1">encode</a><span class="tsd-signature-symbol">?</span><span class="tsd-signature-symbol">(</span><span class="tsd-kind-parameter">value</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">; </span><br/><span class="tsd-signature-symbol">}</span></div><section class="tsd-panel-group tsd-index-group"><section class="tsd-panel tsd-index-panel"><details class="tsd-index-content tsd-index-accordion" open><summary class="tsd-accordion-summary tsd-index-summary"><h5 class="tsd-index-heading uppercase" role="button" aria-expanded="false" tabIndex="0"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><use href="#icon-chevronSmall"></use></svg> Index</h5></summary><div class="tsd-accordion-details"><section class="tsd-index-section"><h3 class="tsd-index-heading">Properties</h3><div class="tsd-index-list"><a href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#domain" class="tsd-index-link tsd-is-external"><svg class="tsd-kind-icon" viewBox="0 0 24 24"><use href="#icon-1024"></use></svg><span>domain?</span></a>
+</div><div class="tsd-comment tsd-typography"></div></section><div class="tsd-signature"><span class="tsd-signature-keyword">interface </span><span class="tsd-kind-interface">CookieSerializeOptions</span> <span class="tsd-signature-symbol">{ </span><br/><span>    </span><a class="tsd-kind-property" href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#domain">domain</a><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">; </span><br/><span>    </span><a class="tsd-kind-property" href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#expires">expires</a><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">Date</span><span class="tsd-signature-symbol">; </span><br/><span>    </span><a class="tsd-kind-property" href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#httpOnly">httpOnly</a><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">boolean</span><span class="tsd-signature-symbol">; </span><br/><span>    </span><a class="tsd-kind-property" href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#maxAge">maxAge</a><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">number</span><span class="tsd-signature-symbol">; </span><br/><span>    </span><a class="tsd-kind-property" href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#path">path</a><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">; </span><br/><span>    </span><a class="tsd-kind-property" href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#priority">priority</a><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">&quot;low&quot;</span><span class="tsd-signature-symbol"> | </span><span class="tsd-signature-type">&quot;medium&quot;</span><span class="tsd-signature-symbol"> | </span><span class="tsd-signature-type">&quot;high&quot;</span><span class="tsd-signature-symbol">; </span><br/><span>    </span><a class="tsd-kind-property" href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#sameSite">sameSite</a><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">boolean</span><span class="tsd-signature-symbol"> | </span><span class="tsd-signature-type">&quot;lax&quot;</span><span class="tsd-signature-symbol"> | </span><span class="tsd-signature-type">&quot;strict&quot;</span><span class="tsd-signature-symbol"> | </span><span class="tsd-signature-type">&quot;none&quot;</span><span class="tsd-signature-symbol">; </span><br/><span>    </span><a class="tsd-kind-property" href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#secure">secure</a><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">boolean</span><span class="tsd-signature-symbol">; </span><br/><span>    </span><a class="tsd-kind-call-signature" href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#encode.encode-1">encode</a><span class="tsd-signature-symbol">?</span><span class="tsd-signature-symbol">(</span><span class="tsd-kind-parameter">value</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">; </span><br/><span class="tsd-signature-symbol">}</span></div><section class="tsd-panel-group tsd-index-group"><section class="tsd-panel tsd-index-panel"><details class="tsd-index-content tsd-index-accordion" open><summary class="tsd-accordion-summary tsd-index-summary"><h5 class="tsd-index-heading uppercase" role="button" aria-expanded="false" tabIndex="0"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><use href="#icon-chevronSmall"></use></svg> Index</h5></summary><div class="tsd-accordion-details"><section class="tsd-index-section"><h3 class="tsd-index-heading">Properties</h3><div class="tsd-index-list"><a href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#domain" class="tsd-index-link tsd-is-external"><svg class="tsd-kind-icon" viewBox="0 0 24 24"><use href="#icon-1024"></use></svg><span>domain?</span></a>
 <a href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#expires" class="tsd-index-link tsd-is-external"><svg class="tsd-kind-icon" viewBox="0 0 24 24"><use href="#icon-1024"></use></svg><span>expires?</span></a>
 <a href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#httpOnly" class="tsd-index-link tsd-is-external"><svg class="tsd-kind-icon" viewBox="0 0 24 24"><use href="#icon-1024"></use></svg><span>http<wbr/>Only?</span></a>
 <a href="_aws_amplify_adapter_nextjs.index._Reference_Types_.CookieSerializeOptions.html#maxAge" class="tsd-index-link tsd-is-external"><svg class="tsd-kind-icon" viewBox="0 0 24 24"><use href="#icon-1024"></use></svg><span>max<wbr/>Age?</span></a>
@@ -43,7 +43,7 @@
 [the specification][rfc-west-cookie-priority-00-4.1].</p>
 <p><strong>note</strong> This is an attribute that has not yet been fully standardized, and may change in the future.
 This also means many clients may ignore this attribute until they understand it.</p>
-</div><div class="tsd-comment tsd-typography"></div></section><section class="tsd-panel tsd-member tsd-is-external"><a id="sameSite" class="tsd-anchor"></a><h3 class="tsd-anchor-link"><code class="tsd-tag ts-flagOptional">Optional</code> <span>same<wbr/>Site</span><a href="#sameSite" aria-label="Permalink" class="tsd-anchor-icon"><svg viewBox="0 0 24 24"><use href="#icon-anchor"></use></svg></a></h3><div class="tsd-signature"><span class="tsd-kind-property">same<wbr/>Site</span><span class="tsd-signature-symbol">?:</span> <span class="tsd-signature-type">boolean</span><span class="tsd-signature-symbol"> | </span><span class="tsd-signature-type">&quot;none&quot;</span><span class="tsd-signature-symbol"> | </span><span class="tsd-signature-type">&quot;lax&quot;</span><span class="tsd-signature-symbol"> | </span><span class="tsd-signature-type">&quot;strict&quot;</span></div><div class="tsd-comment tsd-typography"><p>Specifies the boolean or string to be the value for the <a href="https://tools.ietf.org/html/draft-ietf-httpbis-rfc6265bis-03#section-4.1.2.7|`SameSite`"><code>Set-Cookie</code> attribute</a>.</p>
+</div><div class="tsd-comment tsd-typography"></div></section><section class="tsd-panel tsd-member tsd-is-external"><a id="sameSite" class="tsd-anchor"></a><h3 class="tsd-anchor-link"><code class="tsd-tag ts-flagOptional">Optional</code> <span>same<wbr/>Site</span><a href="#sameSite" aria-label="Permalink" class="tsd-anchor-icon"><svg viewBox="0 0 24 24"><use href="#icon-anchor"></use></svg></a></h3><div class="tsd-signature"><span class="tsd-kind-property">same<wbr/>Site</span><span class="tsd-signature-symbol">?:</span> <span class="tsd-signature-type">boolean</span><span class="tsd-signature-symbol"> | </span><span class="tsd-signature-type">&quot;lax&quot;</span><span class="tsd-signature-symbol"> | </span><span class="tsd-signature-type">&quot;strict&quot;</span><span class="tsd-signature-symbol"> | </span><span class="tsd-signature-type">&quot;none&quot;</span></div><div class="tsd-comment tsd-typography"><p>Specifies the boolean or string to be the value for the <a href="https://tools.ietf.org/html/draft-ietf-httpbis-rfc6265bis-03#section-4.1.2.7|`SameSite`"><code>Set-Cookie</code> attribute</a>.</p>
 <ul>
 <li><code>true</code> will set the <code>SameSite</code> attribute to <code>Strict</code> for strict same
 site enforcement.</li>