Skip to content

fix(gatsby): Decode base path in runtime #30682

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Apr 12, 2021
Merged

fix(gatsby): Decode base path in runtime #30682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
60f18b7
Decode base path
herecydev Apr 5, 2021
d322a07
Formatting
herecydev Apr 5, 2021
58876de
Add test for encoded basepath
herecydev Apr 5, 2021
7cd5642
Merge remote-tracking branch 'upstream/master' into feature/decodeBas…
herecydev Apr 10, 2021
89ce592
Add another test
herecydev Apr 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions packages/gatsby/cache-dir/__tests__/find-path.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,16 @@ describe(`find-path`, () => {
global.__BASE_PATH__ = `/blog`
expect(cleanPath(`/blog/mypath`)).toBe(`/mypath`)
})

it(`strip out a complex basePrefix`, () => {
global.__BASE_PATH__ = `/test/blog`
expect(cleanPath(`/test/blog/new`)).toBe(`/new`)
})

it(`strip out an encoded basePrefix`, () => {
global.__BASE_PATH__ = encodeURIComponent(`/тест`)
expect(cleanPath(`/тест/mypath`)).toBe(`/mypath`)
})
})

describe(`findMatchPath`, () => {
Expand Down
5 changes: 4 additions & 1 deletion packages/gatsby/cache-dir/find-path.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ let matchPaths = []
const trimPathname = rawPathname => {
const pathname = decodeURIComponent(rawPathname)
// Remove the pathPrefix from the pathname.
const trimmedPathname = stripPrefix(pathname, __BASE_PATH__)
const trimmedPathname = stripPrefix(
pathname,
decodeURIComponent(__BASE_PATH__)
)
// Remove any hashfragment
.split(`#`)[0]
// Remove search query
Expand Down