Skip to content

Fix handling of a URL which has a non-hash componenet in the place of a hash #37

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
XhmikosR merged 3 commits into from
Aug 30, 2019
Merged

Fix handling of a URL which has a non-hash componenet in the place of a hash #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ba9cf2
Fix handling of a URL which has a non-hash componenet in the place of…
Aug 30, 2019
1b82b75
Update index.js
XhmikosR Aug 30, 2019
7b65a1a
Refactor to reuse the position of the hash in the file name
Aug 30, 2019
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: 6 additions & 4 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,15 @@ const staticify = (root, options) => {

const fileName = path.basename(p);
const fileNameParts = fileName.split('.');
const fileNameHashPosition = fileNameParts.length - 2;
const fileNameHash = fileNameParts[fileNameHashPosition];
const re = new RegExp(`^[0-9a-f]{${HASH_LEN}}$`, 'i');
const reResult = re.exec(fileNameHash);

if (fileNameParts.length >= 3 &&
fileNameParts[fileNameParts.length - 2].length === HASH_LEN &&
re.exec(fileNameParts[fileNameParts.length - 2])[0] === fileNameParts[fileNameParts.length - 2]
if (fileNameParts.length >= 3 && fileNameHash.length === HASH_LEN &&
(reResult && reResult[0] === fileNameHash)
) {
const stripped = fileNameParts.slice(0, fileNameParts.length - 2);
const stripped = fileNameParts.slice(0, fileNameHashPosition);

stripped.push(fileNameParts[fileNameParts.length - 1]);

Expand Down
8 changes: 8 additions & 0 deletions test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,18 @@ describe('.stripVersion', () => {
staticify(ROOT).stripVersion(path.normalize('/script.js')).should.equal(path.normalize('/script.js'));
});

it('should not fail when the path contains a 7 character string that is not a hash', () => {
staticify(ROOT).stripVersion(path.normalize('/script.abcdefg.html')).should.equal(path.normalize('/script.abcdefg.html'));
});

it('should strip the (long) hash from a path when necessary', () => {
staticify(ROOT, {shortHash: false}).stripVersion(path.normalize('/script.4e2502b01a4c92b0a51b1a5a3271eab6.js')).should.equal(path.normalize('/script.js'));
staticify(ROOT, {shortHash: false}).stripVersion(path.normalize('/script.js')).should.equal(path.normalize('/script.js'));
});

it('should not fail when the path contains a 32 character string that is not a hash', () => {
staticify(ROOT).stripVersion(path.normalize('/script.abcdefgabcdefgabcdefgabcdefgabcd.html')).should.equal(path.normalize('/script.abcdefgabcdefgabcdefgabcdefgabcd.html'));
});
});

describe('.getVersionedPath', () => {
Expand Down