Skip to content

Commit

Permalink
fix(server): exclude http and https from regex (#155)
Browse files Browse the repository at this point in the history
* Exclude http and https from regex. Should fix #153

* Fix regex whitespace and simplify

* Add test for joinURLPath
  • Loading branch information
patrickhaug authored and gregberge committed Nov 19, 2018
1 parent 2af8cf6 commit 0bb2ad9
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
3 changes: 2 additions & 1 deletion packages/server/src/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ export const smartRequire = modulePath => {
return require(modulePath)
}

export const joinURLPath = (...paths) => paths.join('/').replace(/\/\//g, '/')
export const joinURLPath = (...paths) =>
paths.join('/').replace(/(?<!:)\/\//g, '/')
20 changes: 20 additions & 0 deletions packages/server/src/util.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { joinURLPath } from './util'

describe('util', () => {
describe('#joinURLPath', () => {
it('should join paths with relative public path', () => {
expect(joinURLPath('public', 'style.css')).toBe('public/style.css')
expect(joinURLPath('public/', 'style.css')).toBe('public/style.css')
})
it('should join paths with absolute public path', () => {
const publicPath = 'http://localhost:3001/public'

expect(joinURLPath(publicPath, 'style.css')).toBe(
`${publicPath}/style.css`,
)
expect(joinURLPath(`${publicPath}/`, 'style.css')).toBe(
`${publicPath}/style.css`,
)
})
})
})

0 comments on commit 0bb2ad9

Please sign in to comment.