resolve conflicts

.github/CODEOWNERS

@@ -8,31 +8,31 @@
 /packages/geo @aws-amplify/amplify-js @aws-amplify/amplify-ui
 /packages/pubsub @aws-amplify/amplify-js @aws-amplify/amplify-data
 /packages/aws-amplify/package.json @aws-amplify/amplify-js-admins
-packages/storage/src/storageBrowser @aws-amplify/amplify-js @aws-amplify/amplify-ui
-packages/storage/storage-browser @aws-amplify/amplify-js @aws-amplify/amplify-ui
+/packages/storage/src/storageBrowser @aws-amplify/amplify-js @aws-amplify/amplify-ui
+/packages/storage/storage-browser @aws-amplify/amplify-js @aws-amplify/amplify-ui
 /.circleci/ @aws-amplify/amplify-js @aws-amplify/amplify-devops
 /.github/ @aws-amplify/amplify-js-admins
 
 # The following paths involve server-side use cases, token/user session management.
 # Changes made to these paths requires additional reviews and approvals.
-/packages/auth @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/aws-amplify/src/adapter-core @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/adapterCore @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/singleton @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/utils/convert @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/utils/WordArray.ts @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/storage @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/utils/generateRandomString.ts @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/utils/globalHelpers @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/utils/urlSafeDecode.ts @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/awsClients/cognitoIdentity @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/clients/internal @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/Hub @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/adapter-nextjs @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/rtn-web-browser @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/storage/src/providers/s3/apis/internal @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/storage/src/providers/s3/apis/server @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/api-rest/src/apis/server.ts @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/api-rest/src/apis/common/internalPost.ts @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/api-graphql/src/server @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/api-graphql/src/internals/server @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
+/packages/auth @haverchuck @cshfang @jimblanc @HuiSF
+/packages/aws-amplify/src/adapter-core @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/adapterCore @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/singleton @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/utils/convert @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/utils/WordArray.ts @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/storage @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/utils/generateRandomString.ts @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/utils/globalHelpers @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/utils/urlSafeDecode.ts @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/awsClients/cognitoIdentity @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/clients/internal @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/Hub @haverchuck @cshfang @jimblanc @HuiSF
+/packages/adapter-nextjs @haverchuck @cshfang @jimblanc @HuiSF
+/packages/rtn-web-browser @haverchuck @cshfang @jimblanc @HuiSF
+/packages/storage/src/providers/s3/apis/internal @haverchuck @cshfang @jimblanc @HuiSF
+/packages/storage/src/providers/s3/apis/server @haverchuck @cshfang @jimblanc @HuiSF
+/packages/api-rest/src/apis/server.ts @haverchuck @cshfang @jimblanc @HuiSF
+/packages/api-rest/src/apis/common/internalPost.ts @haverchuck @cshfang @jimblanc @HuiSF
+/packages/api-graphql/src/server @haverchuck @cshfang @jimblanc @HuiSF
+/packages/api-graphql/src/internals/server @haverchuck @cshfang @jimblanc @HuiSF

.github/dependency-review/dependecy-review-config.yml

@@ -1,6 +1,7 @@
 allow-licenses:
   - '0BSD'
   - 'Apache-2.0'
+  - 'Apache-2.0 AND MIT'
   - 'BlueOak-1.0.0'
   - 'BSD-1-Clause'
   - 'BSD-2-Clause-FreeBSD'

.github/integ-config/integ-all.yml

@@ -843,6 +843,13 @@ tests:
     sample_name: [storage-gen2]
     spec: storage-gen2
     browser: *minimal_browser_list
+  - test_name: integ_react_storage_internal
+    desc: 'React Storage Gen2 Internal APIs'
+    framework: react
+    category: storage
+    sample_name: [storage-gen2-internal]
+    spec: storage-gen2-internal
+    browser: *minimal_browser_list
   - test_name: integ_next_storage
     desc: 'Next Storage Auth'
     framework: next

CONTRIBUTING.md

@@ -126,6 +126,16 @@ In your sample project, you can now link specific packages
 yarn link @aws-amplify/auth
 ```
 
+If you are testing with a Vite sample project, such as from the quickstart guide, and your changes to the library are not showing up in your local app when running `yarn run dev`, Vite caching may be the culprit. Try editing this line in your sample project's `package.json`.
+
+```diff
+"scripts": {
+- "dev": "vite",
++ "dev": "vite --force",
+  ...
+}
+```
+
 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.
 
 #### Verdaccio