Skip to content

PrefixLink fixes #325

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 3 commits into from
Jul 5, 2016
Merged

PrefixLink fixes #325

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96299e6
Disable prefixLink for base64 data urls
jakubrohleder Jun 11, 2016
a9661d0
Use path.join for link prefixing
jakubrohleder Jun 11, 2016
ecca692
Fix error for links that are not strings
jakubrohleder Jun 11, 2016
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: 9 additions & 1 deletion lib/isomorphic/gatsby-helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
import { config } from 'config'
import invariant from 'invariant'
import isString from 'lodash/isString'
import path from 'path'

function isDataURL (s) {
// Regex from https://gist.github.com/bgrins/6194623#gistcomment-1671744
// eslint-disable-next-line max-len
const regex = /^\s*data:([a-z]+\/[a-z0-9\-\+]+(;[a-z\-]+=[a-z0-9\-]+)?)?(;base64)?,[a-z0-9!\$&',\(\)\*\+,;=\-\._~:@\/\?%\s]*\s*$/i
return !!s.match(regex)
}

// Function to add prefix to links.
const prefixLink = (_link) => {
Expand All @@ -14,7 +22,7 @@ const prefixLink = (_link) => {
`
invariant(isString(config.linkPrefix), invariantMessage)

return config.linkPrefix + _link
return (!isString(_link) || isDataURL(_link)) ? _link : path.join(config.linkPrefix, _link)
} else {
return _link
}
Expand Down