Skip to content

Fix pathPrefix #7182

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
KyleAMathews merged 2 commits into from
Aug 9, 2018
Merged

Fix pathPrefix #7182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d09c0cc
Fix pathPrefix
m-allanson Aug 9, 2018
d1e0a91
merge master
m-allanson Aug 9, 2018
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
6 changes: 3 additions & 3 deletions packages/gatsby-link/src/__tests__/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ const getReplace = () => {
}

const getWithPrefix = (pathPrefix = ``) => {
Object.assign(global.window, {
__PATH_PREFIX__: pathPrefix,
})
global.__PATH_PREFIX__ = pathPrefix

return withPrefix
}

const setup = ({ sourcePath = `/active`, linkProps } = {}) => {
global.__PATH_PREFIX__ = ``
const source = createMemorySource(sourcePath)
const history = createHistory(source)

Expand Down
8 changes: 5 additions & 3 deletions packages/gatsby-link/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,11 @@ class GatsbyLink extends React.Component {
...rest
} = this.props

const prefixTo = withPrefix(to)

return (
<Link
to={to}
to={prefixTo}
state={state}
getProps={getProps}
innerRef={this.handleRef}
Expand All @@ -135,7 +137,7 @@ class GatsbyLink extends React.Component {
e.preventDefault()
// Is this link pointing to a hash on the same page? If so,
// just scroll there.
const { pathname, hash } = parsePath(to)
const { pathname, hash } = parsePath(prefixTo)
if (pathname === location.pathname || !pathname) {
const element = hash
? document.getElementById(hash.substr(1))
Expand All @@ -151,7 +153,7 @@ class GatsbyLink extends React.Component {

// Make sure the necessary scripts and data are
// loaded before continuing.
push(to)
push(prefixTo)
}

return true
Expand Down
9 changes: 7 additions & 2 deletions packages/gatsby/cache-dir/static-entry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,13 @@ export default (pagePath, callback) => {

const bodyComponent = createElement(
ServerLocation,
{ url: pagePath },
createElement(Router, null, createElement(RouteHandler, { path: `/*` }))
{ url: `${pathPrefix}${pagePath}` },
createElement(Router,
{
baseuri: pathPrefix.slice(0, -1),
},
createElement(RouteHandler, { path: `/*` })
)
)

// Let the site or plugin render the page component.
Expand Down
3 changes: 0 additions & 3 deletions packages/gatsby/src/redux/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ try {
initialState.nodes = objectToMap(initialState.nodes)
}
} catch (e) {
if (process.env.NODE_ENV === `test`) {
console.log(`error loading initialState`, e)
}
// ignore errors.
}

Expand Down