186526
/
unpkg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'wmhilton-contrib-percent-40'

This commit is contained in:
Michael Jackson 2019-04-08 17:39:04 -07:00
parent fe11175f9d 59e402a41e
commit bc69d086f7
1 changed files with 8 additions and 14 deletions
modules/utils
parsePackageURL.js

22
modules/utils/parsePackageURL.js
View File

@ -2,20 +2,14 @@ import url from 'url';
const packageURLFormat = /^\/((?:@[^/@]+\/)?[^/@]+)(?:@([^/]+))?(\/.*)?$/;
function decodeParam(param) {
if (param) {
try {
return decodeURIComponent(param);
} catch (error) {
// Ignore invalid params.
}
export default function parsePackageURL(originalURL) {
let { pathname, search, query } = url.parse(originalURL, true);
try {
pathname = decodeURIComponent(pathname);
} catch (error) {
return null;
}
return '';
}
export default function parsePackageURL(originalURL) {
const { pathname, search, query } = url.parse(originalURL, true);
const match = packageURLFormat.exec(pathname);
// Disallow invalid URL formats.
@ -24,8 +18,8 @@ export default function parsePackageURL(originalURL) {
}
const packageName = match[1];
const packageVersion = decodeParam(match[2]) || 'latest';
const filename = decodeParam(match[3]);
const packageVersion = match[2] || 'latest';
const filename = match[3] || '';
return {
// If the URL is /@scope/name@version/file.js?main=browser: