Skip to content
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

Jump to bottom

Virtual routing fix #224

Merged
merged 12 commits into from
Jan 3, 2018
Merged

Virtual routing fix #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fedbd52
Merge pull request #1 from parcel-bundler/master
Dec 9, 2017
3f31fc5
Merge branch 'master' of github.com:DeMoorJasper/parcel
DeMoorJasper Dec 9, 2017
b09d15f
Merge pull request #4 from parcel-bundler/master
Dec 11, 2017
80b3431
Merge branch 'master' of github.com:DeMoorJasper/parcel
DeMoorJasper Dec 11, 2017
392bbc9
run prettier
DeMoorJasper Dec 11, 2017
7049c4f
potential fix
DeMoorJasper Dec 11, 2017
b71a1b9
fix relative paths
DeMoorJasper Dec 11, 2017
02df04a
switch to last index to still support relative paths on legit assets
DeMoorJasper Dec 11, 2017
12df633
add test
DeMoorJasper Dec 21, 2017
f69c772
Merge branch 'master' into feature/linkChecking
Dec 22, 2017
b75844d
Merge branch 'master' into feature/linkChecking
Dec 22, 2017
dbbbd59
fix failing test
DeMoorJasper Dec 30, 2017
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
4 changes: 4 additions & 0 deletions src/assets/HTMLAsset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ class HTMLAsset extends Asset {
if (node.attrs) {
for (let attr in node.attrs) {
let elements = ATTRS[attr];
// Check for virtual paths
if (node.tag === 'a' && node.attrs[attr].lastIndexOf('.') < 1) {
break;
}
if (elements && elements.includes(node.tag)) {
let assetPath = this.addURLDependency(node.attrs[attr]);
if (!isURL(assetPath)) {
Expand Down
18 changes: 18 additions & 0 deletions test/html.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,24 @@ describe('html', function() {
assert(html.includes('<a href="#hash_link">'));
});

it('Should detect virtual paths', async function() {
let b = await bundle(
__dirname + '/integration/html-virtualpath/index.html'
);

assertBundleTree(b, {
name: 'index.html',
assets: ['index.html'],
childBundles: [
{
type: 'html',
assets: ['other.html'],
childBundles: []
}
]
});
});

it('should not update root/main file in the bundles', async function() {
await bundle(__dirname + '/integration/html-root/index.html');

Expand Down
11 changes: 11 additions & 0 deletions test/integration/html-virtualpath/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!doctype html>
<html>
<head>
<title>Virtual path test</title>
</head>
<body>
<a href="/somewhere">Virtual path</a>
<a href="/some/other/route">Another virtual path</a>
<a href="./other.html">A real path</a>
</body>
</html>
9 changes: 9 additions & 0 deletions test/integration/html-virtualpath/other.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!doctype html>
<html>
<head>
<title>Virtual path test</title>
</head>
<body>
<h1>Other page</h1>
</body>
</html>