Skip to content

Commit 6d09cc7

Browse files
authored
Merge branch 'aws-amplify:main' into main
2 parents 23ca3cd + a0ef60f commit 6d09cc7

File tree

54 files changed

+699
-229
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+699
-229
lines changed

amplify/cli.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,8 @@
4949
"project": {
5050
"overrides": true
5151
}
52+
},
53+
"debug": {
54+
"shareProjectConfig": false
5255
}
5356
}

cspell.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
"AbortIncompleteMultipartUpload",
4343
"accesskey",
4444
"accessKey",
45+
"ACCESSKEYID",
46+
"ACCESSKEY",
4547
"AccessToken",
4648
"AccountRepresentative",
4749
"ACLs",
@@ -500,6 +502,7 @@
500502
"devpreview",
501503
"dflt",
502504
"Didfinishlaunchingwithoptions",
505+
"displayMode",
503506
"displayOrder",
504507
"DocSet",
505508
"DocSets",
@@ -843,6 +846,7 @@
843846
"myAmplifyProject",
844847
"myangularapp",
845848
"myapi",
849+
"reactamplified",
846850
"myapp.xcodeproj",
847851
"myapp",
848852
"mybucket",

generatePathMap.cjs.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ function generatePathMap(
5858
'/lib/q/platform/react-native': {
5959
page: '/lib/q/platform/[platform]'
6060
},
61+
'/lib-v1/q/platform/ios': {
62+
page: '/lib-v1/q/platform/[platform]'
63+
},
6164
'/ui/q/framework/react': {
6265
page: '/ui/q/framework/[framework]'
6366
},
30.2 KB
Loading
50.1 KB
Loading
-9.28 KB
Binary file not shown.
20.3 KB
Loading
29.3 KB
Loading
54.6 KB
Loading

src/components/Menu/FilterSelect/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ const getFirstPathSegment = (path: string): string | undefined => {
2828
const multiLibVersionPlatforms = ['ios']
2929

3030
const convertToRouteHerf = (filter: FilterSelectProps, targetFilterKey: string) => {
31-
let path = filter.url
31+
const url = filter.url.startsWith('/') ? `file://${filter.url}` : filter.url
32+
let path = new URL(url).pathname
3233

3334
const firstPathSegment = getFirstPathSegment(path)
3435
if (firstPathSegment)

0 commit comments

Comments
 (0)